Index: applications/editors/josm/i18n/build.xml
===================================================================
--- applications/editors/josm/i18n/build.xml	(revision 16400)
+++ applications/editors/josm/i18n/build.xml	(revision 16407)
@@ -85,4 +85,5 @@
     <ant target="build-lang"><property name="language" value="nl"/></ant>
     <ant target="build-lang"><property name="language" value="pl"/></ant>
+    <ant target="build-lang"><property name="language" value="pt_BR"/></ant>
     <ant target="build-lang"><property name="language" value="ro"/></ant>
     <ant target="build-lang"><property name="language" value="ru"/></ant>
Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 16400)
+++ applications/editors/josm/i18n/po/ar.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-19 21:29+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-27 16:07+0000\n"
 "Last-Translator: AtomCell <shelhatem@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,8 +17,8 @@
 "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-06-27 12:19+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -26,6 +26,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -33,30 +33,31 @@
 msgstr "المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "الإسقاط لا يمكن أن يقرأ من الأفضليات. باستخدام Mercator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "التغييرات غير المحفوظة"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "حفظ و خروج"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "تجاهل و خروج"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -69,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -88,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -99,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "تجاهل URL سيئة التكوين: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "تجاهل عنوان  الملف  المشوه : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "مجهول"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "معلومات حول"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "أعرض شاشة المعلومات حول."
@@ -132,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -143,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "الإصدار {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "آخر تغيير في {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "إصدارجافا {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "صفحة الإنترنت"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "تقارير عن أخطاء"
@@ -171,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -177,27 +179,27 @@
 msgstr "معلومات"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "نص للقراءة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "مراجعة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "المشاركة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "إضافات"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "حول JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "لا يمكن العثور عن الملف"
@@ -211,12 +213,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "الرجاء إختيار على الأقل عقدتين للدمج."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "التحذير"
@@ -271,5 +272,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "خط العرض"
@@ -278,5 +279,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "خط الطول"
@@ -284,5 +285,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "نظم العقد على حلقة"
@@ -295,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -381,7 +382,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "علاقة متناقضة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -390,37 +390,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "المعطيات"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "الطبقة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "الخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "التناقض"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "نزّل"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "زوم الى {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "كبّر/صغّر الرؤية إلى {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -430,9 +430,9 @@
 msgstr "أعرض: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "لا يوجد شيء محدد للتكبير/للتصغير."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "لا  تناقضات للتكبير عليها"
@@ -520,37 +520,41 @@
 msgstr "الرجاء إختيار شيء للنسخ."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "إنشاء حلقة"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "كوّن مستديرة من ثلاث عقد مختارة."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "الرجاء إختيار ثلاثة عقد بلضبط أو إختر طريقاً واحدة تضم ثلاثة عقد بلضبط."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "هذه العقد ليست في مستديرة."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "الرجاء إختيار ثلاثة عقد بلضبط أو إختر طريقاً واحدة تضم ثلاثة عقد بلضبط."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "أحذف"
@@ -600,5 +604,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -705,11 +709,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -720,5 +725,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "خطأ"
@@ -728,30 +733,30 @@
 msgstr "إختر رخصة معرفة سابقاً"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "المساعدة على الخط لِـ ج.أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "إفتح في المتصفح"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "حرّر"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -759,19 +764,19 @@
 msgstr "أعد التحميل"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "خطء عند تحميل الصفحة {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -791,7 +796,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "الخط الزمني للعنصر"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
@@ -854,5 +858,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr ""
@@ -891,10 +895,10 @@
 msgstr "إلى اليمين"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "حرذك {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -902,5 +906,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "غير قادر على تحريك الأغراض إلى خارج الدنيا"
@@ -1091,5 +1095,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1097,26 +1101,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "مستند فارغ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "لا يحتوي المستند على أي معطيات."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "رغم ذلك احفظه"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "التناقضات"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1124,36 +1127,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "إحفظ ملف أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "إحفظ ملف GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "إمتداد ملف غير معروف."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "حصل خطأ عند الحفظ."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1202,6 +1205,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "اغلق"
@@ -1442,68 +1446,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "حمّل إلى أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "الأغراض اللتي يجب إضافتها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "الأغراض اللتي يجب تغييرها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "الأغراض اللتي يجب حذفها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "حمّل هذه التغييرات :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "حمّل التغييرات"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "يوجد تناقضات غير محلولة. يجب عليك حلّ هذه التناقضات أولاً."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "لا يوجد تغييرات للتحميل."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1517,17 +1521,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1538,10 +1542,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1551,9 +1555,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1563,18 +1567,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1679,24 +1683,15 @@
 msgstr "المعطيات الخام لجهاز نظام تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "جاري تحميل المعطيات"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "لم يتم تحميل أي معطيات"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "طبقة المعطيات {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "معطيات OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "طبقة المعطيات"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1738,5 +1733,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1837,5 +1832,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -1846,5 +1841,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -1860,7 +1855,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1868,9 +1863,9 @@
 msgstr "إختر"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "إختر، حرّك و دوّر أغراض"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1879,10 +1874,33 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "حرّك إلى اليسار"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "حرّك إلى اليسار"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "تَراجَع"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1899,5 +1917,5 @@
 msgstr "تكبير/تصغيرو تحريك الخريطة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2155,35 +2173,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "أضِف"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "غيّر"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "أمحي {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "غيّر غرض {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2194,19 +2204,26 @@
 msgstr[2] "أغراض"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "أحذف \"{0}\"  لِــ {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "عيّن  {0}={1} لِــ {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2214,25 +2231,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "أمحي {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "أمحي {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "علاقة متناقضة"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2243,11 +2260,11 @@
 "محو من العلاقة ؟"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2256,10 +2273,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr ""
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2268,20 +2285,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "حرك"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2311,43 +2328,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
+#, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "أحذف من الخيار"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "أدر"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+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:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2443,25 +2466,51 @@
 msgstr "لم أتمكن من تحميل التفضيلات من الخادم."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "درجات عشرية"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr "درجات دقائق ثواني"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "ج."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "ش."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "غ."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "ش."
@@ -2472,5 +2521,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2495,5 +2544,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2604,17 +2653,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2622,16 +2667,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2643,127 +2677,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "أمحي العضو ''{0}'' في العلاقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "للطريق ''{0}'' أقل من نقطتين."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "دور غير معروف ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "نوع عضو غير معروف لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "لم أجد طريق \"من\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "لم أجد طريق \"إلى\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "الطريق الداخلية ''{0}''موجودة في الخارج."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "النص"
@@ -2771,5 +2805,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2797,6 +2831,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "الخلفية"
@@ -2806,19 +2840,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2829,30 +2853,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "حزام لامبيرت (فرنسا)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "حزام لامبيرت (أستونيا)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "مركاتوري"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "حرذك {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2864,14 +2882,14 @@
 msgstr "لم أتمكن من كتابة العلامة المرجعية."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "أخبار اليوم غير متوفرة"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "جاري تنزيل \"أخبار اليوم\""
@@ -3056,5 +3074,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3116,5 +3133,5 @@
 msgstr "صغّر الرؤية"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "المقياس"
@@ -3148,8 +3165,13 @@
 msgstr "(لا يوجد أي غرض)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "الطبقة ليست في اللائحة."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3157,9 +3179,9 @@
 msgstr "جاري الإتصال بلخادم أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "لم يُعثر على الملف"
@@ -3219,4 +3241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3226,4 +3249,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3231,5 +3256,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "الأعضاء"
@@ -3425,7 +3451,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3505,4 +3531,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3510,4 +3539,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3517,4 +3547,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3630,7 +3661,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "الرجاء إدخال إسم للموقع."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3672,7 +3702,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "لا إختصار"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3704,7 +3733,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "أحذف من الخيار"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3715,9 +3743,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "الدّور"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3735,4 +3765,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3756,8 +3788,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3768,7 +3800,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3824,5 +3857,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "تكدس الأوامر"
@@ -3833,6 +3866,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3843,5 +3876,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3850,10 +3883,27 @@
 msgstr "أقلب: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "تكدس الأوامر: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "التناقض"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "دمج التناقضات."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "حلّ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3861,26 +3911,4 @@
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "حلّ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "التناقض"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "دمج التناقضات."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "التناقضات: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -3917,43 +3945,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "أنقر إعادة التعبئة لإنعاش اللائحة"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "الخط الزمني"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "أعرض الخط الزمني للبنود المختارة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "الغرض"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "التاريخ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "إعادة تعبئة كلّ الأغراض المختارة حالياً ثم أنعش اللائحة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "إسترجع"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "لمّا مفعّل."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4086,4 +4119,18 @@
 msgid "Add Properties"
 msgstr "أضف صفة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "أضِف"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4200,14 +4247,14 @@
 msgstr "الخيار: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "أنقر لتكبير/تصغير محتويات اللوحة"
@@ -4237,179 +4284,101 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "طبّق التغيرات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "الأساسي"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "المشغول من"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "حرّك إلى الأعلى"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "أضف الإختيار"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "أزل المختارة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "إنزع كلّ الأغراض المختارة حالياً من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "رياضة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+msgid "Sort the selected relation members or the whole list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "حرّك إلى الأسفل"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "أزل العضو في سطر الجدول الحالي من هذه العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "نزّل الأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "الأعضاء: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "محرّر العلاقات: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "حصل تعارض حين الإستيراد."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "خطأ عند التحليل النحوي لردّ المخدم."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "غير قادر على الإتصال بلمخدم."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4444,21 +4413,21 @@
 msgstr "إختر أولاً إشارة مرجعية"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "خ. العرض الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "خ. الطول الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "خ. العرض الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "خ. الطول الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4466,5 +4435,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "العلبة المحاطة"
@@ -4613,675 +4582,41 @@
 msgstr "أرقام البلاطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "الصول لِــ {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "إقرءGPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "لا توقيت للنقطة {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "جاري قراءة {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "الإنحراف الحالي: {0}ث"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "إختلاف في التوقيت الجغرافي: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "صورة"
-msgstr[1] "صورتين"
-msgstr[2] "صور"
-msgstr[3] "صورة"
-msgstr[4] "صور"
-msgstr[5] "صور"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} من ضمن المسلك."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "صور  (*.jpg)JPEG"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "الصورة"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "نقطة gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "إستعمل الإعدادات العامة."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "حدد خيارات رسم الخطوط"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "خصّص اللون"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "مُوافق"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "الغيابي"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "إختر لون"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "إستورد صوت مسجل"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "ملفات صوتيت (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "العلامات الصوتية من {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "إستورد صور"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "الإسم: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "الوصف: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "الفترة الزمنية "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "الطول: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>إنّ تحميل معطيات جهاز تحديد المواقع العالمي غير المعالجة مسبقاً قد تكون "
-"مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "محوّل من: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "نزّل كلّ شيئ بين:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} أمتار"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "المساحة القصوى للمطلب:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} كلم²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "خارج عن المنطقة المنزلة"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} يتألف من:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} ممحي.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "مسلك واحد"
-msgstr[1] "مسلكين"
-msgstr[2] "ثلاثة مسالك"
-msgstr[3] "مسالك"
-msgstr[4] "مسالك"
-msgstr[5] "مسالك"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "نقطة"
-msgstr[1] "نقطتين"
-msgstr[2] "نقاط"
-msgstr[3] "نقاط"
-msgstr[4] "نقاط"
-msgstr[5] "نقاط"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} نقطة"
-msgstr[1] "نقطتين {0}"
-msgstr[2] "{0} نقاط"
-msgstr[3] "{0} نقطة"
-msgstr[4] "{0} نقطة"
-msgstr[5] "{0} نقطة"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "دلالة"
-msgstr[1] "دلالتين"
-msgstr[2] "دالات"
-msgstr[3] "دالات"
-msgstr[4] "دالات"
-msgstr[5] "دالات"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "مزامنة الصوت"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "تمّت مزامنة الصوت على النقطة {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "غير قادر على إنشاء دالة صوتيت جديدة."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "التفضيلات المتقدمة"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "القيمة الحالية هي الغيابية."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "القيمة الغيابية هي ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "القيمة الغيابية غير معروفة حالياً (لم يتم بعد التعيين)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "القيمة الجديدة لِــ {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "أدخل زوج جديد مفتاح/قيمة"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "أعرض لائحة الخيارات الصوتية."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "اللون"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -5991,5 +5326,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6140,40 +5476,736 @@
 msgstr "الإسم"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "الصول لِــ {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "إقرءGPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "لا توقيت للنقطة {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "جاري قراءة {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "الإنحراف الحالي: {0}ث"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "إختلاف في التوقيت الجغرافي: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "صورة"
+msgstr[1] "صورتين"
+msgstr[2] "صور"
+msgstr[3] "صورة"
+msgstr[4] "صور"
+msgstr[5] "صور"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} من ضمن المسلك."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "صور  (*.jpg)JPEG"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "الصورة"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "نقطة gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "إستعمل الإعدادات العامة."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "حدد خيارات رسم الخطوط"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "خصّص اللون"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "مُوافق"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "الغيابي"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "إختر لون"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "إستورد صوت مسجل"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "ملفات صوتيت (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "العلامات الصوتية من {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "إستورد صور"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "الإسم: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "الوصف: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "الفترة الزمنية "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "الطول: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>إنّ تحميل معطيات جهاز تحديد المواقع العالمي غير المعالجة مسبقاً قد تكون "
+"مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "محوّل من: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "نزّل كلّ شيئ بين:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} أمتار"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "المساحة القصوى للمطلب:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} كلم²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "طبقة المعطيات {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "خارج عن المنطقة المنزلة"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} يتألف من:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} ممحي.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "مسلك واحد"
+msgstr[1] "مسلكين"
+msgstr[2] "ثلاثة مسالك"
+msgstr[3] "مسالك"
+msgstr[4] "مسالك"
+msgstr[5] "مسالك"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "نقطة"
+msgstr[1] "نقطتين"
+msgstr[2] "نقاط"
+msgstr[3] "نقاط"
+msgstr[4] "نقاط"
+msgstr[5] "نقاط"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} نقطة"
+msgstr[1] "نقطتين {0}"
+msgstr[2] "{0} نقاط"
+msgstr[3] "{0} نقطة"
+msgstr[4] "{0} نقطة"
+msgstr[5] "{0} نقطة"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "دلالة"
+msgstr[1] "دلالتين"
+msgstr[2] "دالات"
+msgstr[3] "دالات"
+msgstr[4] "دالات"
+msgstr[5] "دالات"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "مزامنة الصوت"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "تمّت مزامنة الصوت على النقطة {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "غير قادر على إنشاء دالة صوتيت جديدة."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "التفضيلات المتقدمة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "القيمة الحالية هي الغيابية."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "القيمة الغيابية هي ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "القيمة الغيابية غير معروفة حالياً (لم يتم بعد التعيين)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "القيمة الجديدة لِــ {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "أدخل زوج جديد مفتاح/قيمة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "أعرض لائحة الخيارات الصوتية."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "اللون"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "نوع   الطلاء   {0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "الطبقة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "إختر"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "الرجاء إختيار اللون لِــ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "الألوان المستعملة في الأغراض المختلفة في ج.أو.أس.أم."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "الألوان"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6182,29 +6214,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "أرسم نقاط عريضة لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "السرعة ( أحمر = بطيء، أخضر= سريع)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "ضوبان الموقع (أحمر=عالي،أخضر=منخفض، عندما تكون متوفرة)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -6212,5 +6244,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6231,5 +6263,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6267,5 +6299,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6278,50 +6310,50 @@
 msgstr "المشي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "أرسم أسهم الإتجاه"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "رسم سريع ( أقل جودة)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "فقط على رأس الطريق."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6329,29 +6361,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "الطول الأقصى (أمتار)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6359,5 +6391,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6365,13 +6397,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "المسافة الأدنى (نقاط)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "أرسم نقاط أكبر لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6379,9 +6411,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6389,136 +6421,156 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "تلوين الأثر و النقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "نقاط جهاز تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "المعطيات أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "اعرض شاشة اللطخ عند بدء التشغيل"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "أظهر معرف ID الغرض في لوائح الإختيار"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "الشكل و المظهر"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "الغيابي (محدد تلقائياً)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "اللغة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "تمكين الغيابيات المبيتة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "تمكين الغيابيات المبيتة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "لائحة التنزيل."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "حدّث"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "الرجاء إختيار خانة."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr ""
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "إعدادات المعراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6526,99 +6578,99 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "إعدادات الاتصال"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "تعيينات الإتصال للخادم أو.أس.أم."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "إعدادات الخريطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "إعدادت إسقاط الخريطة و تفسير المعطيات."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "تعيينات الصوت"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 "يجب عليك إعادة بدء تشغيل ج.أو.أس.أم كي تُأخذ بعض التغييرات بعين الإعتبار."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "أعرض الإحداثيات كــ"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "منهج الإسقاط"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "إسقاط الخريطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "منهج الإسقاط"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "أعرض الإحداثيات كــ"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "تمكين خادم التوكيل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "بدون ذكر الإسم"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "إعدادات الوكيل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "مضيف مخدم التوكيل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "منفذ مخدم التوكيل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "الإسم على مخدم التوكيل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "كلمة المرور عند مخدم التوكيل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "URL الخادم الأساسي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "كلمة المرور أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6633,75 +6685,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "تفضيلات إختصارات لوحة المفاتيح"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "تغيير إختصارات لوحة المفاتيح يدوياً"
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "الفعل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "الإختصار"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "الوصف: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "الطبقة: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "المؤلفون: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "المساعدة: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "الإصدار {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "إستعمل الغيابي"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "إضافة عقدة جديدة إلى طريق موجودة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "تمكين الغيابيات المبيتة"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "الفاصل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "شريط الأدوات"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "المتوفّر"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "تخصيص إعتيادات شريط الأدوات"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "تخصيص إعتيادات العناصر على شريط الأدوات"
@@ -6955,6 +7040,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7277,5 +7362,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7285,15 +7370,15 @@
 msgstr "{0}% ({1}/{2}), {3} باقية. متابعة الإرسال لِــ {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7303,5 +7388,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7310,23 +7395,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7372,6 +7457,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr ""
@@ -7386,5 +7471,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7392,5 +7477,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7398,19 +7483,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7418,5 +7503,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7424,19 +7509,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "المعلومات"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "لا يوجدأي وصف"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7445,13 +7530,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7461,9 +7546,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7473,6 +7558,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7495,14 +7580,14 @@
 msgstr "مجهول"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: الإصدار {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7746,45 +7831,45 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7983,20 +8068,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8004,13 +8089,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8032,5 +8117,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -8364,5 +8449,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr ""
@@ -8465,17 +8550,18 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
-#, fuzzy
 msgid "Format errors: "
-msgstr "خطء في صيغة المعطيات"
+msgstr ""
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
 msgid "TangoGPS import success"
-msgstr "نجاح إسيراد NMEA"
+msgstr ""
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
 msgid "TangoGPS import faliure!"
-msgstr "فشل إستيراد NMEA !"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
+msgid "TCX Files (*.tcx)"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8500,5 +8586,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8519,11 +8605,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8532,6 +8618,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr ""
@@ -8594,6 +8680,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr ""
@@ -8899,7 +8985,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "الماء"
@@ -9228,14 +9314,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "إفتح OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9361,19 +9447,19 @@
 msgstr "الأفعال المسموح بها"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "هل تريد السماح بذلك ؟"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9497,7 +9583,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "جاري الإرسال..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9685,13 +9770,4 @@
 #: ../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 ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
 msgstr ""
 
@@ -9901,33 +9977,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10233,23 +10309,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10258,5 +10334,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10264,78 +10340,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10343,74 +10419,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+msgid "Use default tag ignore file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+msgid "Use the default tag ignore file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10555,7 +10639,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr ""
@@ -10569,5 +10653,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr ""
@@ -10577,25 +10661,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10618,17 +10702,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "الإتصال"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr ""
@@ -10666,14 +10755,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr ""
@@ -10771,5 +10860,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10782,117 +10871,106 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+msgid "Load WMS layer from file"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "WMS Plugin Preferences"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "WMS Plugin Preferences"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
+msgid "Menu Name"
 msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
-msgid "Menu Name"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+msgid "WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "Menu Name (Default)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "WMS URL (Default)"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
-msgid "WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "Menu Name (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "WMS URL (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "نزّل"
 
 #. *
@@ -11104,16 +11182,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "حمّل ملفات TCX مباشرتاً من ج.أو.أس.أم."
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11122,5 +11195,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11129,5 +11202,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11136,10 +11209,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -11936,4 +12009,64 @@
 msgstr ""
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr ""
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -11957,5 +12090,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr ""
@@ -12003,5 +12136,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr ""
@@ -12038,5 +12171,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12054,4 +12187,28 @@
 #: build/trans_presets.java:623
 msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
 msgstr ""
 
@@ -12268,6 +12425,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr ""
@@ -12293,6 +12450,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr ""
@@ -12318,6 +12475,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr ""
@@ -12343,6 +12500,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr ""
@@ -12356,5 +12513,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr ""
@@ -12372,5 +12529,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr ""
@@ -12388,5 +12545,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12413,6 +12587,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr ""
@@ -12462,5 +12636,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr ""
@@ -13439,5 +13613,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr ""
@@ -15168,27 +15342,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "الرياضة"
@@ -18026,8 +18200,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr ""
@@ -18096,8 +18270,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr ""
@@ -18123,5 +18297,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr ""
@@ -18251,4 +18425,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18257,4 +18432,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18263,4 +18439,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18269,4 +18446,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18330,7 +18508,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "جسر"
@@ -18388,4 +18566,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18511,7 +18690,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18594,15 +18773,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "مهجور"
@@ -18644,5 +18823,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "خيل"
@@ -18852,11 +19031,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -18894,6 +19073,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "شارع"
@@ -18949,7 +19128,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -19005,8 +19184,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "سكة حديد"
@@ -19027,5 +19206,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19039,5 +19218,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19058,5 +19237,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "مستديرة دوران"
@@ -19071,5 +19250,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19084,5 +19263,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "شاطئ نهر"
@@ -19096,5 +19275,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "جدول نهر"
@@ -19108,5 +19287,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "حوض سفن"
@@ -19134,5 +19313,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "قنة جر"
@@ -19300,13 +19479,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "من صنع الإنسان"
@@ -19368,7 +19547,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19391,10 +19570,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19414,7 +19593,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19422,8 +19604,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "سكة حديد قديمة"
@@ -19468,6 +19654,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19481,5 +19667,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr ""
@@ -19501,5 +19687,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19513,5 +19699,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19559,7 +19745,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "خط جوي"
@@ -19576,5 +19762,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19589,5 +19775,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19602,5 +19788,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19615,5 +19801,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19628,5 +19814,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19641,5 +19827,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -19744,10 +19930,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "طاقة"
@@ -19761,5 +19947,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "رصيف ميناء"
@@ -19773,5 +19959,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "خط أنابيب"
@@ -19899,12 +20085,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "وقت الفراغ"
@@ -19918,5 +20104,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "مارينا"
@@ -19988,8 +20174,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20091,10 +20277,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20480,22 +20666,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20527,6 +20713,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20587,8 +20773,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "صحة"
@@ -20941,26 +21127,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "متجر/دكان"
@@ -21032,8 +21218,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "فندق"
@@ -21183,9 +21369,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "سياحة"
@@ -21257,8 +21443,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "تاريخي"
@@ -21329,8 +21515,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "خضار"
@@ -21344,5 +21530,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "كسارة / مقلع حجارة"
@@ -21356,5 +21542,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr ""
@@ -21376,5 +21562,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "حوض"
@@ -21388,5 +21574,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "غابة"
@@ -21400,5 +21586,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "فناء مزرعة"
@@ -21421,5 +21607,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "بيع بلمفرق"
@@ -21433,5 +21619,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "صناعي"
@@ -21445,5 +21631,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21457,5 +21643,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "حقل خضار"
@@ -21469,5 +21655,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21524,7 +21710,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "عسكري"
@@ -21538,5 +21724,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "مقبرة/جبانة"
@@ -21549,5 +21735,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "قمّة"
@@ -21562,5 +21748,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "نهر الجليد"
@@ -21574,5 +21760,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "بركان"
@@ -21627,8 +21813,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "طبيعي"
@@ -21642,5 +21828,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "أشجار منخفضة"
@@ -21654,5 +21840,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "أرض بور"
@@ -21666,5 +21852,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "غابة/حرش"
@@ -21678,5 +21864,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "طين"
@@ -21690,5 +21876,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "شاطئ"
@@ -21766,8 +21952,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "طريق"
@@ -21815,7 +22001,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "الحدود"
@@ -21957,10 +22143,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "المكان"
@@ -22008,6 +22194,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "العنوان"
@@ -22238,10 +22424,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr ""
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22249,5 +22435,5 @@
 msgstr "خرائط NPE"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22255,52 +22441,73 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr ""
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "معطيات OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr ""
-
-#. yahoo://gnome-web-photo-fixed {0}
+msgid "OpenCycleMap"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr ""
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr ""
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "شوارع  NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "طبقة المعطيات"
+
+#~ msgid "Change"
+#~ msgstr "غيّر"
+
+#~ msgid "Rotate"
+#~ msgstr "أدر"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "التناقضات: {0}"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "حمّل ملفات TCX مباشرتاً من ج.أو.أس.أم."
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
 #~ msgid "Uploading data"
 #~ msgstr "جاري تحميل التغييرات"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "لمّا مفعّل."
+
 #~ msgid "Email"
 #~ msgstr "البريد الإلكتروني"
@@ -22309,4 +22516,7 @@
 #~ msgstr "حلّ التناقضات"
 
+#~ msgid "Object"
+#~ msgstr "الغرض"
+
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم."
@@ -22332,4 +22542,13 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "حلّ {0} التناقضات في {1} أغراض"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة"
+
+#~ msgid "Revert"
+#~ msgstr "إسترجع"
+
+#~ msgid "Date"
+#~ msgstr "التاريخ"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 16400)
+++ applications/editors/josm/i18n/po/bg.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-22 19:20+0000\n"
-"Last-Translator: LandShark <Unknown>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-27 16:00+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,31 +32,32 @@
 msgstr "Помощ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 "Проекцията не може да се прочете от настройките. Ще използваме Меркатор."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Съвет: Някои промени са дошли при качването на данните към сървъра."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Незаписани промени"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Има несъхранени промени. Да ги отхвърлим ли за да продължим?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Запис и Изход"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Откажи промените и Изход"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -69,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -88,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -99,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Отмяна"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнориране на неправилна препратка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнориране неправилен адрес на файл: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "НЕИЗВЕСТНО"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "За програмата"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Покажи екран с информация за програмата."
@@ -132,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -143,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Последни промени: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Версия Java: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Домашна страница"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Съобщаване на грешки"
@@ -171,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -177,27 +179,27 @@
 msgstr "Данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "За прочитане"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Ревизия"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Участници"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Разширения"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "За JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Файла не може да бъде намерен"
@@ -211,12 +213,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Моля изберете поне един възел или път."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Внимание"
@@ -271,5 +272,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Геогр. Ширина:"
@@ -278,5 +279,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Геогр. Дължина:"
@@ -284,5 +285,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Подреди точките в кръг"
@@ -295,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -363,7 +364,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Не е инициализирано"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -382,7 +382,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Конфликтиращи релации"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -391,37 +390,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "избор"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "конфликт"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "свалено"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Показване на {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Промяна на мащаба за да може да се види {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -431,9 +430,9 @@
 msgstr "Изглед: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Няма нищо избрано за показване."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Няма конфликти за показване."
@@ -527,37 +526,41 @@
 msgstr "Моля, изберете нещо за копиране."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Създаване окръжност"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Създаване на окръжност от три избрани точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Моля, изберете точно три точки или един сегмент с три точки."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Точките не са разположени по кръг"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Моля, изберете точно три точки или един сегмент с три точки."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Изтриване"
@@ -608,5 +611,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -716,11 +719,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -731,5 +735,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Грешка"
@@ -739,30 +743,30 @@
 msgstr "Изберете лиценз от набора"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "Online-помощ за JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Отваряне в браузър"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Редактиране"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -770,15 +774,15 @@
 msgstr "Презареди"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr ""
 "Възможно е да се редактират само справочните страници на JOSM Online Help"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Грешка при зареждане на страница {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
@@ -786,5 +790,5 @@
 "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -801,18 +805,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Показване на историческа информация за OSM обекти."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "История на елемент"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Показване на историческа информация за OSM обекти."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -875,5 +876,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Огледално"
@@ -912,10 +913,10 @@
 msgstr "надясно"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Преместване {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -923,5 +924,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Невъзможно да се премества обектите извън границите на света."
@@ -1117,5 +1118,5 @@
 msgstr "Файлът {0} съществува. Презаписване?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1125,26 +1126,25 @@
 "информирайте за тази грешка."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Няма отворени документи. Няма какво да се съхранява."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Празен документ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Документът не съдържа данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Записване въпреки всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Конфликти"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1154,36 +1154,36 @@
 "обработени все едно сте ги отменили всички. Да продължаваме ли?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Отхвърляне конфликтите и записване"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Съхраняване OSM файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Съхраняване GPX файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Запис на слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Невъзможно да се създаде резервно копие."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Неизвестно файлово разширение."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Възникна грешка при записване."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Възникна грешка при възстановяване на резервно копие."
@@ -1236,6 +1236,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Затваряне"
@@ -1308,11 +1309,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Всички нови линии са включени към релацията на база роля.\n"
-"Трябва да проверите това и при необходимост да внесете корекции."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1495,68 +1493,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Качи на OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Качване на всички промени на OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Обекти за добавяне:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Променени обекти:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Обекти за изтриване:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Опишете измененията на качваните от вас данни:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Качване на тези промени?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Качване на промени"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Нищо за качване. Първо създайте някакви данни."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Има неразрешени конфликти. Първо трябва да ги разрешите."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Няма промени за качване."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1570,17 +1568,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1591,10 +1589,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1604,9 +1602,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1616,18 +1614,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1732,24 +1730,15 @@
 msgstr "Изходни GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Сваляне на данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Никакви данни не са импортирани"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Слой Данни {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap данни"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Слой с данни"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1791,5 +1780,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1893,5 +1882,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника."
@@ -1903,5 +1892,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпуснете бутона на мишката за да спрете въртенето."
@@ -1920,7 +1909,7 @@
 "тази точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1928,9 +1917,9 @@
 msgstr "Избиране"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Избиране, преместване и завъртане на обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1939,5 +1928,28 @@
 msgstr[1] "Добавяне и преместване на виртуален нов възел към {0} пътя"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Преместване наляво"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Преместване наляво"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Отмяна"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1946,5 +1958,5 @@
 "най-близката точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1963,5 +1975,5 @@
 msgstr "Пормяна на мащаба и предвижване по картата"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2230,35 +2242,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Добави"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Промени"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Изтриване {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Промяна {0} обект"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Изтриване \"{0}\" за {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Задаване {0}={1} за {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2268,19 +2272,26 @@
 msgstr[1] "обекти"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Изтриване \"{0}\" за {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Задаване {0}={1} за {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2288,25 +2299,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Изтриване {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Изтриване {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Конфликтиращи релации"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2317,11 +2328,11 @@
 "Изтриване от релацията?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Изтриване от релация"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2332,10 +2343,10 @@
 "Изтриване от релацията?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Разделяне пътен сегмент"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2347,20 +2358,20 @@
 "не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Преместване"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2386,43 +2397,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "Премахнати елементи от Релации"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "Премахване на член в релация"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Завъртане"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, 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:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2520,25 +2537,51 @@
 msgstr "Невъзможно да се заредят предпочитанията от сървъра."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "Десетични градуси"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr "Градуси, минути, секунди"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "Ю"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "З"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "И"
@@ -2549,5 +2592,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2572,5 +2615,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2669,17 +2712,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2687,16 +2726,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2708,127 +2736,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Път, обознаващ граница на област, не е затворен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "мултиполигонен път ''{0}'' не е затворен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "В релацията има член ''{0}'', който е бил изтрит."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Пътя ''{0}'' е с по-малко от две точки."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr "Повече от един път \"от\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "Повече от един път \"до\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Повече от един \"през\" са открити."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестна роля ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестен тип членство за ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Не е намерен път \"от\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Не е намерен път \"до\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "Не е открит възел или път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"до\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"от\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"до\" не започва или свършва в път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стил за ограничение {0} не е намерен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Не-Път ''{0}'' в мултиполигон."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Липсва външен път за мултиполигон ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Пресичане между пътища ''{0}'' и ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Вътрешният път ''{0}'' се намира отвън."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стилът за външния път ''{0}'' се разминава."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "немаркиран"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "текст"
@@ -2836,5 +2864,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2862,6 +2890,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "фон"
@@ -2871,24 +2899,9 @@
 msgstr "подчертай"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Проекцията \"{0}\" е разработена само\n"
-"за широчини между 46.1° и 57°.\n"
-"Използвайте друга проекция, ако не използвате\n"
-"френски WMS server. Не качвайте \n"
-"никакви данни на сървъра след това съобщение."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2905,36 +2918,24 @@
 "започнете нов слой в новата зона."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Ламбертова зона (Франция)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Ламбертова Зона (Естония)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Проекция Меркатор"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Проекция \"{0}\" е предназначена за\n"
-"географски широчини между 45.7° и 47.9°\n"
-"и географски дължини между 5.7° и 10.6° само.\n"
-"Използвайте друга проекция, ако не работите\n"
-"върху данни от Швейцария или Лихтенщайн.\n"
-"Не качвайте никакви данни след това съобщение."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарска Мрежа (Швейцария)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Преместване {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2946,14 +2947,14 @@
 msgstr "Невъзможен записът на отметките."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Съобщение за деня не е налично"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- изпълняващата се версия е {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Зареждане на \"Съобщение на деня\""
@@ -3146,5 +3147,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3206,5 +3206,5 @@
 msgstr "Намаляване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "мащаб"
@@ -3238,8 +3238,13 @@
 msgstr "(няма обект)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "слоя не е в списъка."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3247,9 +3252,9 @@
 msgstr "Свързване с OSM сървър..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Грешка при разбор"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Файлът не е намерен"
@@ -3310,4 +3315,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3317,4 +3323,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3322,5 +3330,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Членове"
@@ -3516,7 +3525,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3596,4 +3605,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3601,4 +3613,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3608,4 +3621,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3634,7 +3648,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Връзката се разпадна."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3726,7 +3739,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Моля въведете име на мястото."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3763,13 +3775,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Да, възстанови от изтриване също"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Без дата"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3801,7 +3811,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "изтрий от селекцията"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3812,9 +3821,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Роля"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3832,4 +3843,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3853,8 +3866,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3865,7 +3878,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3921,5 +3935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Списък промени"
@@ -3930,6 +3944,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3940,5 +3954,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3947,10 +3961,27 @@
 msgstr "Превключи: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Списък промени: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Конфликт"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Разрешяване конфликти."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Разрешаване"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Отваряне диалог за сливане на избраните обекти от горния списък."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3959,26 +3990,4 @@
 msgstr "Изберете на картата всички обекти, избрани в списъка по-горе."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Разрешаване"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Отваряне диалог за сливане на избраните обекти от горния списък."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Конфликт"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Разрешяване конфликти."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Конфликти: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -4014,45 +4023,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Натиснете \"Презареди\" за обновяване на списъка"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "История"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Показване историята на всички избрани обекти."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Обект"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Дата"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Презареждане на всички текущо избрани обекти и опресняване на списъка."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Възстановяване"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Възстановяване състоянието на всички текущо избрани обекти до версията, "
-"указана в списъка с промени."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Не е добавено още."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4185,4 +4197,18 @@
 msgid "Add Properties"
 msgstr "Добавяне на параметри"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Добави"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4295,9 +4321,9 @@
 msgstr "Избрано: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Отсъедини панела"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4306,5 +4332,5 @@
 "левия панел."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела"
@@ -4334,179 +4360,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Приложи промените"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Основен"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Обект"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Маркери (празна стойност изтрива маркера)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Преместване нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Преместване на текущо избраните членове нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Добавяне на избраните"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Добавяне на всички текущо обекти като членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Изтриване на избраното"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Изтриване на всички текущи избрани обекти от релацията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Спорт"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Изтриване на източник от списъка"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Преместване надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Преместване на текущо избраните членове надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Изтриване на члена от текущия ред на таблицата от тази релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Сваляне членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Сваляне всички непълни пътища и възли от релацията"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "да"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "не"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Членове: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Редактор релации: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Възникнаха конфликти при импортване."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Грешка при разбор на отговора на сървъра."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Невъзможно да се установи връзка със сървъра."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4541,21 +4490,21 @@
 msgstr "Изберете първо отметка"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "мин. ширина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "мин. дължина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "макс. ширина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "макс. дължина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4565,5 +4514,5 @@
 "за сваляне)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Рамка"
@@ -4714,687 +4663,41 @@
 msgstr "Номера квадранти"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Изображения за {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Прочитане GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Не е указано време за точка {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Не е намерено изображение с информация за времето."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Четене {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Изображения с данни за местоположение"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS Начало: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS Край: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "текуща разлика: {0} с."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "разлика в часови пояси: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "изображение"
-msgstr[1] "изображения"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} в пределите на следата"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Синхронизация часовник"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "Изображения JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Невозможно да се прочете датата от файла \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Липсва EXIF време във файла \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Изображение"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Часова зона на GPS устойството (разлика със снимките)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Синхронизиране времето с GPS приемника"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Въведенето време не може да бъде използвано."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "GPS точка"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Настройка рисуването на линии"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Използвай глобалните настройки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "Чертай линии между точките на този слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr "Не чертай линии между точките на този слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Избиране варианти за чертане на линиите."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Избор цвят"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "ОК"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "По подразбиране"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Изберете цвят"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Маркери от наименувани точки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Наименувани точки от следа от {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Импорт Аудио"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave аудио файлове (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Аудио маркери от {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Импорт на изображения"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} следа, "
-msgstr[1] "{0} следи, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} маршрут, "
-msgstr[1] "{0} маршрути, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} точка на интерес"
-msgstr[1] "{0} точки на интерес"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Название: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Описание: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Времеви интервал: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Дължина: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Преобразувай в слой данни"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Качването на необработени GPS данни в картата се смята за вредно."
-"<br>Ако искате да качвате следи, погледнете тук:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Преобразувано от: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Свали от OSM по дължина на тази следа"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Свали всичко в пределите на:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} метри"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Максимална област за една заявка:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} кв. км."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Това действие ще изисква {0} отделни<br>заявки за сваляне. "
-"Продължаване?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Някои пътни точки, които са с време преди началото или след края на следата, "
-"са пропуснати или преместени в началото."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Точките, които бяха прекалено далеч от останалите от следата, за да може "
-"смислено да се предположи тяхното време, бяха пропуснати."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "извън областта за сваляне"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "версия {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} се състои от:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} изтрити.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "неустановена"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "API версия: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Преобразувай в слой GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "следа"
-msgstr[1] "следи"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "точка"
-msgstr[1] "точки"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "следа с {0} точка"
-msgstr[1] "следа с {0} точки"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} се състои от {1} следа"
-msgstr[1] "{0} се състои от {1} следи"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} точка"
-msgstr[1] "{0} точки"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "GPS маркер"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "маркер"
-msgstr[1] "маркери"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} се състои от {1} маркер"
-msgstr[1] "{0} се състои от {1} маркери"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Синхронизиране аудио"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Аудио синхронизирано на точка {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr "Невъзможно да се синхронизира в слоя, който се изпълнява."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Установи аудио маркер на позицията на прослушване"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"Трябва да сте поставили аудио пауза в точката от следата, където искате "
-"маркера."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Няма съществуващи аудио маркери в този слой, спрямо които да се отмести."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"Трябва да провлачите момента на изпълнение близо до GPX следата, чийто "
-"асоцииран звук прослушвате (след първия маркер)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Трябва да SHIFT-влачите позицията на прослушване върху аудио маркер или "
-"върху точка от следа, където искате да синхронизирате."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Невъзможно да се създаде нов аудио-маркер."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Възникна грешка при опит да се покаже URL препратката за този маркер"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL беше: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Грешка показване URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Разширени настройки"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Директна настройка на параметрите. Ползвайте внимателно."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Търси: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Текуща стойност по подразбиране."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Текущата стойност е ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Стойност по подразбиране неизвестна (настройката все още не е използвана)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Моля, изберете ред за редактиране"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Нова стойност за {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Моля, изберете ред за изтриване."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Въведете нова двойка ключ/стойност"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Показване на меню Аудио."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Етикиране на аудио маркери, картинки и уеб."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Показване на живо на аудио следата."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Създаване на не-аудио маркери при четене GPX."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Изрично изискване точки в следата да са с валидно време."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-"Изрично изискване точките в следата да има време, изчислено от тяхната "
-"позиция."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Наименовани точки от следата."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Променени времена на аудио файлове."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "Начало на следа (винаги ще се прави, ако няма други маркери)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Покажи или скрий аудио менюто в главното меню."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Показване на движеща се икона, представяща точката от синхронизираната "
-"следа, където текущо възпроизвежащния аудио запис е бил записан."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Слагане на текстови етикети до аудио (и картинки, и уеб) маркери, както и "
-"техните бутони-икони."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Автоматично създаване на слой с маркери от всяка точка на интерес при "
-"отваряне на GPX слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "При импорт на аудио, създай маркери от..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "При импорт на аудио, приложи го към всяка точка от GPX слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Автоматично създай аудио маркери от точките на следата (вместо от изрични "
-"точки на интерес) с имена или описания."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Създаване на аудио маркери на позиции в следата, отговаряща на промененото "
-"време на всеки импортиран аудио WAV файл."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Показване колко секунди напред или назад ще се прескочи при натискане на "
-"съответния бутон."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Време пренавиване (секунди)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Показване, колко пъти ще се увеличи скорост при бързо прослушване"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Множител за бързо прослушване"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Възпроизвежането започва толкова секунди преди (или след, ако е отрицателно "
-"число) посочената позицията в аудио записа"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Продължителност на встъплението (секунди)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr "Съотношение на времето със записан глас към цялото изминало време"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Калибровка на звукозаписа"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Цвят"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6104,5 +5407,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6253,40 +5557,748 @@
 msgstr "Име"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Изображения за {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Прочитане GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Не е указано време за точка {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Не е намерено изображение с информация за времето."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Четене {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Изображения с данни за местоположение"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS Начало: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS Край: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "текуща разлика: {0} с."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "разлика в часови пояси: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "изображение"
+msgstr[1] "изображения"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} в пределите на следата"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Синхронизация часовник"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "Изображения JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Невозможно да се прочете датата от файла \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Липсва EXIF време във файла \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Изображение"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Часова зона на GPS устойството (разлика със снимките)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Синхронизиране времето с GPS приемника"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Въведенето време не може да бъде използвано."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "GPS точка"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Настройка рисуването на линии"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Използвай глобалните настройки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "Чертай линии между точките на този слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr "Не чертай линии между точките на този слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Избиране варианти за чертане на линиите."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Избор цвят"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "ОК"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "По подразбиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Изберете цвят"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Маркери от наименувани точки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Наименувани точки от следа от {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Импорт Аудио"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave аудио файлове (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудио маркери от {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Импорт на изображения"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} следа, "
+msgstr[1] "{0} следи, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} маршрут, "
+msgstr[1] "{0} маршрути, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} точка на интерес"
+msgstr[1] "{0} точки на интерес"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Название: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Времеви интервал: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Дължина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Преобразувай в слой данни"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Качването на необработени GPS данни в картата се смята за вредно."
+"<br>Ако искате да качвате следи, погледнете тук:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Преобразувано от: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Свали от OSM по дължина на тази следа"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Свали всичко в пределите на:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} метри"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Максимална област за една заявка:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} кв. км."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Това действие ще изисква {0} отделни<br>заявки за сваляне. "
+"Продължаване?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Някои пътни точки, които са с време преди началото или след края на следата, "
+"са пропуснати или преместени в началото."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Точките, които бяха прекалено далеч от останалите от следата, за да може "
+"смислено да се предположи тяхното време, бяха пропуснати."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Слой Данни {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "извън областта за сваляне"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} се състои от:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} изтрити.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "неустановена"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "API версия: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Преобразувай в слой GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "следа"
+msgstr[1] "следи"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "точка"
+msgstr[1] "точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "следа с {0} точка"
+msgstr[1] "следа с {0} точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} се състои от {1} следа"
+msgstr[1] "{0} се състои от {1} следи"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} точка"
+msgstr[1] "{0} точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "GPS маркер"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "маркер"
+msgstr[1] "маркери"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} се състои от {1} маркер"
+msgstr[1] "{0} се състои от {1} маркери"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Синхронизиране аудио"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Аудио синхронизирано на точка {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr "Невъзможно да се синхронизира в слоя, който се изпълнява."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Установи аудио маркер на позицията на прослушване"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Трябва да сте поставили аудио пауза в точката от следата, където искате "
+"маркера."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Няма съществуващи аудио маркери в този слой, спрямо които да се отмести."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Трябва да провлачите момента на изпълнение близо до GPX следата, чийто "
+"асоцииран звук прослушвате (след първия маркер)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Трябва да SHIFT-влачите позицията на прослушване върху аудио маркер или "
+"върху точка от следа, където искате да синхронизирате."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Невъзможно да се създаде нов аудио-маркер."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Възникна грешка при опит да се покаже URL препратката за този маркер"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL беше: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Грешка показване URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Разширени настройки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Директна настройка на параметрите. Ползвайте внимателно."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Търси: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Текуща стойност по подразбиране."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Текущата стойност е ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Стойност по подразбиране неизвестна (настройката все още не е използвана)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Моля, изберете ред за редактиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Нова стойност за {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Моля, изберете ред за изтриване."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Въведете нова двойка ключ/стойност"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Показване на меню Аудио."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Етикиране на аудио маркери, картинки и уеб."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Показване на живо на аудио следата."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Създаване на не-аудио маркери при четене GPX."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Изрично изискване точки в следата да са с валидно време."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+"Изрично изискване точките в следата да има време, изчислено от тяхната "
+"позиция."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Наименовани точки от следата."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Променени времена на аудио файлове."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "Начало на следа (винаги ще се прави, ако няма други маркери)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Покажи или скрий аудио менюто в главното меню."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Показване на движеща се икона, представяща точката от синхронизираната "
+"следа, където текущо възпроизвежащния аудио запис е бил записан."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Слагане на текстови етикети до аудио (и картинки, и уеб) маркери, както и "
+"техните бутони-икони."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Автоматично създаване на слой с маркери от всяка точка на интерес при "
+"отваряне на GPX слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "При импорт на аудио, създай маркери от..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "При импорт на аудио, приложи го към всяка точка от GPX слоя."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Автоматично създай аудио маркери от точките на следата (вместо от изрични "
+"точки на интерес) с имена или описания."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Създаване на аудио маркери на позиции в следата, отговаряща на промененото "
+"време на всеки импортиран аудио WAV файл."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Показване колко секунди напред или назад ще се прескочи при натискане на "
+"съответния бутон."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Време пренавиване (секунди)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "Показване, колко пъти ще се увеличи скорост при бързо прослушване"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Множител за бързо прослушване"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Възпроизвежането започва толкова секунди преди (или след, ако е отрицателно "
+"число) посочената позицията в аудио записа"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Продължителност на встъплението (секунди)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr "Съотношение на времето със записан глас към цялото изминало време"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Калибровка на звукозаписа"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Цвят"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Стил на изобразяване {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Слой: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Изберете"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Изберете цвят за {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Задай по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Задай всички да са по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Цветове, използвани от различни обекти в JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Цветове"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6295,30 +6307,30 @@
 msgstr "Всички"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Само локални файлове"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Никога"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Изобразвай линии, даже и ако не са импортирани сегменти."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Изобразявай големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорост (червено = бавно, зелено = бързо)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Неточност на позицията (червено = висока, зелено = ниска, ако е приложимо)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Единствен цвят (може да се настройва за наименувани слоеве)"
@@ -6326,5 +6338,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6345,5 +6357,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6381,5 +6393,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6392,16 +6404,16 @@
 msgstr "Пеш"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Изобразвай направлението със стрелки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Бързо изрисуване (изглежда по-зле)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -6409,34 +6421,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Само в началото на път."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Показвай поредния номер на сегментите"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Изобразвай границите на свалените данни."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Изобразявай виртуални възли в режим на избор."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Изобразявай неактивните слоеве в друг цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Изглаждане на линиите (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Свързване с линии на GPS точките"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6446,9 +6458,9 @@
 "Задайте '-1' за чертаене на всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Максимална дължина за локални файлове (метри)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6457,20 +6469,20 @@
 "се рисуват всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Максимална дължина (в метри)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Изобразвай линии, даже ако не е импортирана информация за линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Изобразвай стрелки по посоката на линиите, съединяващи GPS точки."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6479,5 +6491,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6486,13 +6498,13 @@
 "Не рисувай стрелки, ако те се не са поне на това разстояние една от друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Минимално разстояние (в пиксели)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Рисуване на по-големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6502,9 +6514,9 @@
 "в мениджър слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Оцветяване точките от следите според скоростта."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6514,5 +6526,5 @@
 "Вашият приемник трябва да поддържа запис на този тип информация."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -6520,33 +6532,33 @@
 "скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Оцветяване на следата"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS Точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Показване на направлението на сегментите на пътя."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показване поредните номера на всички сегменти на пътя."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Приложи изглаждане върху картата."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Изобразяване границата на областа, свалена от сървъра."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6555,99 +6567,120 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Изобразяване неактивните слоеве с данни в други цветове."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM Данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Съхраняване резервни копия"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "При запис, оставяй резервни копия на файловете завършващи с ~"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Показване на стартова картинка"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Показване на ID на обектите в списъците с избрани"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Рисуване на «гумена» помощна линия"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Безрежимна работа (Потлач стил)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Да не се изисква превключване на режими (Потлач стил работа)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Външен вид"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "По подразбиране (Автоматично определени)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Език"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Използване на вградените настройки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Използване на вградените настройки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Тип писта"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Настройка на достъпните разширения."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Свали списък"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Обновяване"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Настройване сайтове..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Моля, изберете елемент."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Настройка сайтове за разширения"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Настройки на дисплея"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6655,82 +6688,82 @@
 msgstr "Различни настройки, влияещи на външния вид на програмата."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Настройки на връзката"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Параметри на връзката с OSM сървъра."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Настройки на картата"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Параметри на проекцията на картата и интерпретацията на данните."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Аудио настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Параметри за звуковия плейър и звуковите маркери."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 "Трябва да рестартирате JOSM, за да може изменените настройки да подействат."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Показвай координатите като"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Метод на проекция"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Картографска проекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Метод на проекция"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Показвай координатите като"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Използване на прокси-сървър"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Настройки на прокси"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Адрес"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Порт"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Потребителско име"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Основен URL адрес на OSM сървъра (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6739,17 +6772,17 @@
 "парола."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Основен URL адрес на сървъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6764,77 +6797,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Настройки клавишни комбинации"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Промяна клавишни комбинации ръчно."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Действие"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Бърз клавиш"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Слой: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Автори: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Помощ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Копирай стойностите по подразбиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Моля изберете ред за копиране."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Добавяне нов източник в списъка."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Изтриване на източник от списъка"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Сортиране меню шаблони"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Използване на вградените настройки"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Източник на шаблони за маркиране"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Източник (URL или име файл) на файлове с дефиниции на шаблони за маркиране. "
-"Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за подробности."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Добавяне на нов източник на шаблони за маркиране към списъка."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Изтриване на източник от списъка"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Шаблони за маркиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Източници на шаблони за маркиране"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Разделител"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Лента с инструменти"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Наличен"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Настройка на панела с инструменти"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Настройка на елеметите на панела с инструменти"
@@ -7112,6 +7176,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7120,7 +7184,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Файлът {0} съществува. Презаписване?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7437,5 +7501,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7445,15 +7509,15 @@
 msgstr "{0}% ({1}/{2}), {3} остава. Качване {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Обновяване разширения"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Зареждане на разширенията"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7466,5 +7530,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7473,23 +7537,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7539,6 +7603,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Изключване на разширение"
@@ -7553,5 +7617,5 @@
 msgstr "Задържане на разширение"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7561,5 +7625,5 @@
 "право да презаписва текущите."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7569,10 +7633,10 @@
 "\"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Съгласно информацията в разширението, автора е {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7581,9 +7645,9 @@
 "за грешка."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Разширението да бъде ли изключено?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7593,5 +7657,5 @@
 "да изключим разширенето."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7601,19 +7665,19 @@
 "JOSM за този проблем."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Информация"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "няма описание"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7622,13 +7686,13 @@
 msgstr[1] "Сваляне на информация за разширението от {0} сайта"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Информация за разширението не е намерена."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Всички инсталирани разширения са последна версия."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7641,9 +7705,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Сваляне на липсващи разширения"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7656,6 +7720,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7678,14 +7742,14 @@
 msgstr "неизвестно"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Версия {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Разширения доставяни с JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7948,45 +8012,45 @@
 "{0} км/ч"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извличане на GPS координати от EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Започване на преглед на директории"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Един от избраните файлове е празен !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Прочитане на снимки..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Невъзможно да се вземе каноничното име на директория {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Сканиране на директория {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Намерен е празен файл в директория {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Грешка при четене на файлове от директория {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Корелиране към GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8196,20 +8260,20 @@
 msgstr "Секунди: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Съотнесени {0} от {1} снимки към GPX следа."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Времева разлика от {0} дни)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Разминаване между следата и снимките: {0}мин {1}сек"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8217,13 +8281,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Съотнасянето на снимки към следа се провали"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Настройване часови пояс и отместване"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Стойности по подразбиране"
@@ -8245,5 +8309,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Грешка при зареждане на файла"
@@ -8601,5 +8665,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Празен слой"
@@ -8704,17 +8768,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Грешка във формата на файла"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "Успешно NMEA импортиране"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Грешка при NMEA импортиране!"
+msgid "TCX Files (*.tcx)"
+msgstr "GPX Файлове (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8739,5 +8805,5 @@
 msgstr "Създаване на копие на път"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Слой за редактиране на GPX следи"
@@ -8758,11 +8824,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Импортиране на път от GPX слой"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Височина на съществуващ път"
@@ -8771,6 +8837,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Не е открит слой с GPX данни."
@@ -8833,6 +8899,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Обновяване"
@@ -9141,7 +9207,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "вода"
@@ -9489,14 +9555,14 @@
 "един низ."
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Отваряне на OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9632,20 +9698,20 @@
 msgstr "Позволени действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "Дистанционното управление получи заявка за зареждане на данни от API-то."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Подробности на заявката: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Желаете ли да разрешите това?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9771,7 +9837,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Качване..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9965,13 +10030,4 @@
 "Първо трябва да укажете източник на шаблони за маркиране в списъка с "
 "предпочитания."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Импортиране на TCX Файл..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Импортиране на TCX файл като GPS следа"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10188,34 +10244,34 @@
 msgstr "Отваряне на диалог, който позволява прескачена до определена позиция"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Въвеждане Шир/Дълж за прескачане до позиция."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Можете също да поставите препратка URL от www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Мащаб (в метри)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Прескочи там"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Прескачане на позиция"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 "Не може да бъде прочетена Широчината, Дължината или Мащаба. Моля проверете."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Неможе да се прочете Дълж/Шир"
@@ -10535,9 +10591,9 @@
 "правописни грешки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Проверка на параметрите:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
@@ -10545,15 +10601,15 @@
 "стойности"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Невалидна линия на таг-проверка - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Невалидна линия на правописна проверка: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10564,5 +10620,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Неправилна комбинация маркер/стойност"
@@ -10570,78 +10626,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Проблем с изобразяването"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Неправилен ключ ''{0}''."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Маркери с празни стойности"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Неправилен параметров ключ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Неправилен интервал в ключ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Стойност на параметър започва или завършва с интервал"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Стойности съдържащи HTML елементи"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Ключ ''{0}'' не е намерен в шаблони."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Шаблоните не съдържат такъв ключ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Стойността ''{0}'' за ключ ''{1}'' не е намерена в шаблоните."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Шаблоните не съдържат стойност"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "ЗА ПОПРАВКА"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Проверка на ключовете."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Проверяване за валидни ключове и сравняване със списък от думи."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Използване на сложен параметров тест."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr "Проверяване стойностите и маркерите използвайки по-сложни правила."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Източници за TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10652,75 +10708,85 @@
 "маркирането."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Добавяне нов източник в списъка."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Редактиране избрания източник."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Източници на данни"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Проверка стойностите."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr "Проверяване дали стойностите са правилни спрямо шаблони."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Проверка за маркерни \"ЗА ПОПРАВКА\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Търси точки или пътища с \"FIXME\" в някой стойност на ключ."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Проверка за бележки при рисуване."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Проверява дали картата при русиване е открила грешки в данните."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Използване на файл с данни по подразбиране."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Използване на файла с данни по подразбиране (препоръчвано)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Използване на файл с данни по подразбиране."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Използване на файла с данни по подразбиране (препоръчвано)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Използване на файла за проверка на правопис по подразбиране."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 "Използване на файла за проверка на правопис по подразбиране (препоръчвано)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Поправи параметрите"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Не може да бъде открит типа на елемента"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Не може да бъде открито нивото на предупрежение"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Неправилен израз ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10865,7 +10931,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "сграда"
@@ -10879,5 +10945,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "област"
@@ -10887,25 +10953,25 @@
 msgstr "Незатворен път"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Несвързани пътища."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Този тест проверява дали път има крайна точка близо до друг път."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Края на път близо до друг път/магистрала"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Края на път близо до друг път/линия"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Възел близо до друг път"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Свързан край на път е близо до друг път"
@@ -10930,17 +10996,22 @@
 "Този тест проверява за пътища без маркировка, празни или само с една точка."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Неименовани пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Редактиране пътен възел"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Немаркирани пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Празни пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Пътища от една точка"
@@ -10978,14 +11049,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Възникна грешка"
@@ -11083,5 +11154,5 @@
 msgstr "Настройте позицията на избрания WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11096,15 +11167,15 @@
 msgstr "Автоматично сваляне"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS слой ({0}), сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11113,102 +11184,91 @@
 "разделителната способност."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Сваляне на видимите квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Смяна разделителна способност"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Презареждане грешни квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Алфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Запис на WMS слоя във файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Зареждане на WMS слой от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Грешка във формата на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Отворете празен WMS слой за да заредите данни от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Настройки модул WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Промяна списъка с WMS сървъри показвани в менюто на WMS разширението"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Име на меню"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Име на меню (по подразбиране)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (по подразбиране)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Въведете име на меню и WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Копирай стойностите по подразбиране"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Моля изберете ред за копиране."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Сваляне"
 
 #. *
@@ -11455,16 +11515,11 @@
 "така."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Директно зареждане на TCX файлове от JOSM."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Създава терасовидни къщи от един блок."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11476,5 +11531,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11485,5 +11540,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11495,10 +11550,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12295,4 +12350,64 @@
 msgstr "Достъп"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "да"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12316,5 +12431,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "частен"
@@ -12362,5 +12477,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "с назначение"
@@ -12397,5 +12512,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "разрешителен"
@@ -12414,4 +12529,28 @@
 msgid "agricultural"
 msgstr "селскостопански"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "не"
 
 #: build/trans_presets.java:315
@@ -12627,6 +12766,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "автомагистрала"
@@ -12652,6 +12791,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "автострада"
@@ -12677,6 +12816,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "главен / първокласен"
@@ -12702,6 +12841,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "второкласен"
@@ -12715,5 +12854,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "третокласен"
@@ -12731,5 +12870,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "улица"
@@ -12747,5 +12886,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "служебна"
@@ -12772,6 +12928,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "ремонт"
@@ -12821,5 +12977,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "кръгово"
@@ -13798,5 +13954,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "блато"
@@ -15527,27 +15683,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "спорт"
@@ -18385,8 +18541,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "велосипед"
@@ -18455,8 +18611,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "пеш"
@@ -18482,5 +18638,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "метро"
@@ -18610,4 +18766,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18616,4 +18773,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18622,4 +18780,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18628,4 +18787,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18689,7 +18849,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "мост"
@@ -18747,4 +18907,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18870,7 +19031,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18953,15 +19114,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "остарял, вече невалиден"
@@ -19003,5 +19164,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "кон"
@@ -19211,11 +19372,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "бариера"
@@ -19253,6 +19414,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "улица"
@@ -19308,7 +19469,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "път_от_пътна_мрежа"
@@ -19364,8 +19525,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "ЖП"
@@ -19386,5 +19547,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "услуги"
@@ -19398,5 +19559,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr "форд"
@@ -19417,5 +19578,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "обръщало"
@@ -19430,5 +19591,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr "точка за връзка със спешна помощ"
@@ -19443,5 +19604,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "речен бряг"
@@ -19455,5 +19616,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "поток"
@@ -19467,5 +19628,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "док"
@@ -19493,5 +19654,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "акведукт"
@@ -19659,13 +19820,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "изкуствени съоръжения"
@@ -19727,7 +19888,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "ЖП точка"
@@ -19750,10 +19911,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "друга ЖП линия"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "ЖП railover"
@@ -19773,7 +19934,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19781,8 +19945,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "стара ЖП линия"
@@ -19827,6 +19995,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "въздушен транспорт"
@@ -19840,5 +20008,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "терминал"
@@ -19860,5 +20028,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "Надземен_транспорт_тъмен"
@@ -19872,5 +20040,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "Надземен_транспорт_светъл"
@@ -19918,7 +20086,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "надземен транспорт"
@@ -19935,5 +20103,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "лесна ски писта"
@@ -19948,5 +20116,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "средно трудна ски писта"
@@ -19961,5 +20129,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "ски писта за напреднали"
@@ -19974,5 +20142,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "ски писта за експерти"
@@ -19987,5 +20155,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "ски писта freeride"
@@ -20000,5 +20168,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "ски писта за начинаещи"
@@ -20103,10 +20271,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "захранване"
@@ -20120,5 +20288,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "кей"
@@ -20132,5 +20300,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "тръбопровод"
@@ -20258,12 +20426,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "отдих и развлечение"
@@ -20277,5 +20445,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "яхт пристан"
@@ -20347,8 +20515,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "Обществени услуги"
@@ -20450,10 +20618,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "Обществен трафик"
@@ -20839,22 +21007,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "Обществено осветление"
@@ -20886,6 +21054,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "светла_вода"
@@ -20946,8 +21114,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "здравеопазване"
@@ -21300,26 +21468,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "магазин"
@@ -21391,8 +21559,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "хотел"
@@ -21542,9 +21710,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "туризъм"
@@ -21616,8 +21784,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "исторически"
@@ -21688,8 +21856,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "зеленина"
@@ -21703,5 +21871,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "кариер"
@@ -21715,5 +21883,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "сметище"
@@ -21735,5 +21903,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "басейн"
@@ -21747,5 +21915,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "гора"
@@ -21759,5 +21927,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "двор ферма"
@@ -21780,5 +21948,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "търговия на дребно"
@@ -21792,5 +21960,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "индустрия"
@@ -21804,5 +21972,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "индустриални развалини"
@@ -21816,5 +21984,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "зелена площ"
@@ -21828,5 +21996,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "ЖП"
@@ -21883,7 +22051,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "военни"
@@ -21897,5 +22065,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "гробище"
@@ -21908,5 +22076,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "връх"
@@ -21921,5 +22089,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "ледник"
@@ -21933,5 +22101,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "вулкан"
@@ -21986,8 +22154,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "природа"
@@ -22001,5 +22169,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "храсталак"
@@ -22013,5 +22181,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "пустош"
@@ -22025,5 +22193,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "гора"
@@ -22037,5 +22205,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "кал"
@@ -22049,5 +22217,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "плаж"
@@ -22125,8 +22293,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "маршрут"
@@ -22174,7 +22342,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "граница"
@@ -22316,10 +22484,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "място"
@@ -22367,6 +22535,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "адрес"
@@ -22597,10 +22765,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Отворена въздушна карта (Open Aerial Map)"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22608,5 +22776,5 @@
 msgstr "NPE Карти"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22614,77 +22782,137 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap данни"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Велоалея"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "подложка Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Улици NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Слой с данни"
+
+#~ msgid "Change"
+#~ msgstr "Промени"
+
+#~ msgid "Rotate"
+#~ msgstr "Завъртане"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Моля изберете поне една точка, път или релация. Само вече качени елементи "
-#~ "имат история."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Възстановяне от изтриване на път..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Проверка дали възел {0} е заминал..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Възстановяване от изтриване на релация..."
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Проверка дали примитив {0} е заминал..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Запази моят"
-
-#~ msgid "Delete mine"
-#~ msgstr "Изтриване на моите"
+#~ "Проекцията \"{0}\" е разработена само\n"
+#~ "за широчини между 46.1° и 57°.\n"
+#~ "Използвайте друга проекция, ако не използвате\n"
+#~ "френски WMS server. Не качвайте \n"
+#~ "никакви данни на сървъра след това съобщение."
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "Проекция \"{0}\" е предназначена за\n"
+#~ "географски широчини между 45.7° и 47.9°\n"
+#~ "и географски дължини между 5.7° и 10.6° само.\n"
+#~ "Използвайте друга проекция, ако не работите\n"
+#~ "върху данни от Швейцария или Лихтенщайн.\n"
+#~ "Не качвайте никакви данни след това съобщение."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Конфликти: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Източник на шаблони за маркиране"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "Източник (URL или име файл) на файлове с дефиниции на шаблони за "
+#~ "маркиране. Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за "
+#~ "подробности."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Добавяне на нов източник на шаблони за маркиране към списъка."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Източници на шаблони за маркиране"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Импортиране на TCX Файл..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Импортиране на TCX файл като GPS следа"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Директно зареждане на TCX файлове от JOSM."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "подложка Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Качване на данни"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Не е добавено още."
+
 #~ msgid "Email"
 #~ msgstr "Е-поща"
@@ -22692,4 +22920,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Разрешаване на конфликти"
+
+#~ msgid "Object"
+#~ msgstr "Обект"
 
 #~ msgid "{0} object has conflicts:"
@@ -22730,4 +22961,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Разрешаване {0} конфликти в {1} обекти"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Натиснете \"Презареди\" за обновяване на списъка"
+
+#~ msgid "Revert"
+#~ msgstr "Възстановяване"
+
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Възстановяване състоянието на всички текущо избрани обекти до версията, "
+#~ "указана в списъка с промени."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22904,4 +23151,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Моля изберете поне една точка, път или релация. Само вече качени елементи "
+#~ "имат история."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -22957,2 +23211,20 @@
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Качването на данни неуспя по неизяснена причина"
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "Възстановяне от изтриване на път..."
+
+#~ msgid "Checking whether node {0} is gone ..."
+#~ msgstr "Проверка дали възел {0} е заминал..."
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "Възстановяване от изтриване на релация..."
+
+#~ msgid "Checking whether primitive {0} is gone ..."
+#~ msgstr "Проверка дали примитив {0} е заминал..."
+
+#~ msgid "Keep mine"
+#~ msgstr "Запази моят"
+
+#~ msgid "Delete mine"
+#~ msgstr "Изтриване на моите"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 16400)
+++ applications/editors/josm/i18n/po/cs.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-24 00:37+0000\n"
-"Last-Translator: Martin Petricek <singularita@gmail.com>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-02 07:31+0000\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "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-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,31 +32,32 @@
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 "Projekce nemohla být načtena z nastavení. Používám Mercatorovu projekci."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Nápověda: některé změny vznikly nahráním nových dat na server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Neuložené změny"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Máte neuložené změny. Zahodit změny a pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Uložit a ukončit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Neuložit změny a ukončit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -69,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -88,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -99,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorují se nekorektní URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoruji poškozený soubor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "NEZNÁMÝ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "O aplikaci"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Zobrazit obrazovku \"O Aplikaci\""
@@ -132,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -143,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Verze {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Poslední změna v {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Verze Java: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Domovská stránka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Nahlášení chyby"
@@ -171,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -177,27 +179,27 @@
 msgstr "Informace"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Readme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revize"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Příspěvek"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "O JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Soubor nebyl nalezen"
@@ -211,12 +213,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Zvolte minimálně jeden uzel nebo cestu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Varování"
@@ -271,5 +272,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Zeměpisná šířka"
@@ -278,5 +279,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Zeměpisná délka"
@@ -284,5 +285,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Seřadit uzly do kruhu"
@@ -295,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -360,10 +361,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "Selhala inicializace API, prosím zkuste to znovu později."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Není inicializováno"
+msgstr "Selhala inicializace API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -382,7 +382,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Konfliktní relace"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -391,37 +390,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "stáhnout"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zvětšit na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zvětšit pohled na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -431,9 +430,9 @@
 msgstr "Zobrazení: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Není zvoleno nic co by se dalo přiblížit"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Není žádný konflikt, na který by se mohlo přiblížit"
@@ -523,37 +522,41 @@
 msgstr "Prosím zvol něco ke kopírování"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Vytvořit kruh"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Vytvořit kruh ze tří uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Prosím vyberte přesně tři body, nebo jednu o třech bodech."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Tyto uzly nejsou v kruhu"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Prosím vyberte přesně tři body, nebo jednu o třech bodech."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Smazat"
@@ -603,5 +606,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -710,11 +713,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -725,5 +729,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Chyba"
@@ -733,30 +737,30 @@
 msgstr "Zvolte předdefinovanou licenci"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM Online Nápověda"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Otevřít v prohlížeči"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -764,19 +768,19 @@
 msgstr "Znovu načíst"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Chyba při načítání stránky {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -793,18 +797,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Zobraz informace o historii cest a bodů v OSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Historie prvku"
+msgstr "Informace o prvku"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Zobraz informace o historii cest a bodů v OSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -864,5 +865,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Zrcadlit"
@@ -901,10 +902,10 @@
 msgstr "vpravo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Přesunout {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -912,5 +913,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Nemohu přesouvat objekty mimo svět."
@@ -1104,5 +1105,5 @@
 msgstr "Soubor {0} již existuje. Přepsat ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1111,26 +1112,25 @@
 "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Prázdný dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dokument neobsahuje žádná data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Přesto uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1140,36 +1140,36 @@
 "vyřešeny, jako by byly všechny odmítnuty. Pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Zamítnout konflikty a uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Uložit OSM soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Uložit GPX soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Ulož vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Nemohu zálohovat soubor."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Neznámá přípona souboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Během ukládání došlo k chybě."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Během obnovení zálohy došlo k chybě."
@@ -1222,6 +1222,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Zavřít"
@@ -1292,12 +1293,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Příslušnost k relaci byla zkopírována na všechny nově vzniklé cesty.\n"
-"Mělo by být zkontrolováno, zda je výsledek korektní, a případné chyby by "
-"měly být opraveny."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1480,68 +1477,68 @@
 msgstr "Prázdný výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Nahrát do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Nahrát všechy změny na OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Objekty k přidání:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Objekty ke změnění:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Objekty ke smazání:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Napište stručný komentář ke změnám, které nahráváte na server:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Nahrát tyto úpravy?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Nahrát změny na server"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Žádné změny k nahrání."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Nahrávám"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovat celý dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1555,17 +1552,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Detekován konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Neočekávaná návratová hodnota. Navráceno {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1576,10 +1573,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1589,9 +1586,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1601,18 +1598,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "Nahrándí do OSM API selhalo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1719,24 +1716,15 @@
 msgstr "Surová GPS data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Stahuji data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Nic nebylo importováno"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datová vrstva {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Vrstva dat"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1778,5 +1766,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1880,5 +1868,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 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"
@@ -1889,5 +1877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Pusť myší tlačítko k zastavení otaáčení"
@@ -1903,7 +1891,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1911,9 +1899,9 @@
 msgstr "Vybrat"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Zvol, posuň a otáčej objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1923,5 +1911,28 @@
 msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Posunout doleva"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Posunout doleva"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Zpět"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1929,5 +1940,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:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1946,5 +1957,5 @@
 msgstr "Přiblížení a pohyb mapy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2214,35 +2225,27 @@
 msgstr "Chyba při komunikaci se serverem."
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Přidat"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Změnit"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Smazat {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Změnit {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Odstraněno \"{0}\" pro {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Nastaveno {0}={1} pro {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2253,19 +2256,26 @@
 msgstr[2] "objekty"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Odstraněno \"{0}\" pro {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Nastaveno {0}={1} pro {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2273,25 +2283,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Smazat {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Smazat {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Konfliktní relace"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2302,11 +2312,11 @@
 "Smazat z relace?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2317,10 +2327,10 @@
 "Smazat z relace?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Rozdělit segment cesty"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2332,20 +2342,20 @@
 "<br>Opravdu je chcete smazat?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Přesunout"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2372,43 +2382,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "odebrat z výběru"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "Odstranit prvek relace"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Otočit"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Smazat {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sekvence"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2506,25 +2522,51 @@
 msgstr "Nemohu nahrát předvolby ze serveru."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "J"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "V"
@@ -2535,5 +2577,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2558,5 +2600,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2659,17 +2701,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2677,16 +2715,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2698,127 +2725,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Cesta se stylem plochy není uzavřená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Cesta v multipolygonu ''{0}'' není uzavřena."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Odstraněn prvek ''{0}'' z relace."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s méně, než dvěmi body."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 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:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 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:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Nalezen více než jeden \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznámá role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, 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:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Nenazezena příchozí cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Nenalezena odchozí cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "Nenalezen \"via\" uzel nebo cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Styl pro omezení {0} nenalezen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Ne-cesta ''{0}'' v multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Vnitřní cesta ''{0}'' je venku."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Styl pro vnější cestu ''{0}'' nesedí."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "nepopsaný"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "text"
@@ -2826,5 +2853,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2852,6 +2879,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "pozadí"
@@ -2861,24 +2888,9 @@
 msgstr "zvýraznit"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Projekce \"{0}\" je navržena pouze\n"
-"pro zeměpisné šířky mezi 46.1° a 57°.\n"
-"Použijte jiný projekční systém, pokud nepoužíváte\n"
-"francouzský WMS server.\n"
-"Nenáhrávejte žádná data po zobrazení této hlášky!"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2895,36 +2907,24 @@
 "kartografické projekce.."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambertova zóna (Francie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertova zóna (Estonsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercatorova projekce"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Kartografická projekce \"{0}\" je použitelná pouze pro\n"
-"zeměpisné šířky mezi 45.7° a 47.9°\n"
-"a zeměpisné délky mezi 5.7° a 10.6°.\n"
-"Použijte jinou projekci v JOSM, pokud nepracujete\n"
-"přímo na území Švýcarska nebo Lichtenštejnska.\n"
-"Od této zprávy neposílejte na server žádná data."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Přesunout {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2936,14 +2936,14 @@
 msgstr "Nemohu zapsat do záložek."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Zprávu dne není možné zobrazit"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- běžící verze je {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Stahuji zprávu dne"
@@ -3134,5 +3134,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3194,5 +3193,5 @@
 msgstr "Oddálit"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "měřítko"
@@ -3226,8 +3225,13 @@
 msgstr "(žádný objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "vrstva není v seznamu"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3235,9 +3239,9 @@
 msgstr "Kontaktuji OSM server..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Chyba při parsování"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
@@ -3297,4 +3301,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3304,4 +3309,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3309,5 +3316,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Členové"
@@ -3503,7 +3511,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3583,4 +3591,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3588,4 +3599,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3595,4 +3607,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3614,14 +3627,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Chyba při komunikaci se serverem."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Chyba při komunikaci se serverem."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3709,7 +3721,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Prosím zadejte jméno umístění"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3751,7 +3762,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Žádné datum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3783,7 +3793,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "odebrat z výběru"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3794,9 +3803,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Role"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3814,4 +3825,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3835,8 +3848,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3847,7 +3860,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3903,5 +3917,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Zásobník příkazů"
@@ -3912,6 +3926,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3922,5 +3936,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3929,10 +3943,29 @@
 msgstr "Přepnout: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Zásobník příkazů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Spojení konfliktů"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Vyřešit"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Otevřít \"dialog sloučení\" pro všechny vybrané položky z předchozího "
+"seznamu."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3940,28 +3973,4 @@
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Vyřešit"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Otevřít \"dialog sloučení\" pro všechny vybrané položky z předchozího "
-"seznamu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Spojení konfliktů"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konflikty: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -3998,44 +4007,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Klikněte na obnovit pro aktualizaci seznamu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Zobrazit historii všech zobrazených objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Datum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Znovu nahrát vybrané objekty a obnovit seznam."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Vrátit zpět"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Zatím neimplementováno."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4170,4 +4183,18 @@
 msgid "Add Properties"
 msgstr "Přidat vlastnosti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Přidat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4282,9 +4309,9 @@
 msgstr "Výběr: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Vytrhnout panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4293,5 +4320,5 @@
 "nástrojů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Minimalizovat nebo maximalizovat obsah panelu"
@@ -4321,179 +4348,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Aplikovat změny"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Základní"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Obsazeno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Tagy (prázdná hodnota vymaže tag)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Posunout nahoru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Přesunout zvolené prvky nahoru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Přidat vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Přidat všechny zvolené objekty mezi prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Odebrat označené"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Odebere všechny označené objekty z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Smazat vybraný zdroj ze seznamu."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Posunout dolů"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Přesunout zvolenou vrstvu o řádek dolů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Odstranit prvek v aktuálním řádku tabulky z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Stáhnout prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "ano"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "ne"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Členové: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editor relací: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Vznikly konflikty během importu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Chyba parsování odezvy serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Nemohu se připojit na server."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4528,21 +4478,21 @@
 msgstr "Nejdříve zvolte záložku"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min šíř."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min dél."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max šíř."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max dél."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4550,5 +4500,5 @@
 msgstr "URL z www.openstreetmap.org (adresu můžete vložit do pole níže)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Ohraničující box"
@@ -4697,670 +4647,41 @@
 msgstr "Čísla dlaždic"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Obrázky pro {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Číst GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Žádný čas pro bod {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Čtu {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Obrázky s GPS souřadnicemi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Start GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Konec GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "nynější odchylka: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "rozdíl časových pásem: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "obrázek"
-msgstr[1] "obrázky"
-msgstr[2] "obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Synchronizovat hodiny"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG obrázky (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Data v souboru \"{0}\" nemohla být parsována."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "V souboru \"{0}\" není časová značka EXIF"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Obrázek"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchronizace času s GPS přijímačem"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Zadaný čas nemůže být rozparsován"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps bod"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Přizpůsobit kreslení linií"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Použít globální nastavení."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Přizpůsobit barvu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Výchozí"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Zvolit barvu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Značky z pojmenovaných bodů"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Pojmenované body z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importovat zvuk"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audiosoubory (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio značky z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importovat obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} cest, "
-msgstr[1] "{0} cesta, "
-msgstr[2] "{0} cesty, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} trasa, "
-msgstr[1] "{0} trasy, "
-msgstr[2] "{0} trasy, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} značka"
-msgstr[1] "{0} značky"
-msgstr[2] "{0} značek"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Jméno: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Popis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Časové rozpětí: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Délka: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Převést do datové vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Nahrání nezpracovaných GPS dat je považováno za poškozování projektu."
-"<br>Pokud chcete nahrát trasy, podívejte se tady:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Převedeno z: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-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:721
-msgid "Download everything within:"
-msgstr "Stáhnout vše v rozmezí:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metrů"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Maximální plocha na požadavek:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} čtverečních km"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Tato akce bude potřebovat<br>{0} samostatných stažení dat.<br>Chcete "
-"pokračovat?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Některé značky, které byly příliš daleko od trasy k rozumnému odhadu času, "
-"byly vynechány."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "mimo stažený areál"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "verze {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} se skládá z:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} smazáno.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "Verze API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Převédst do GPX vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "tras"
-msgstr[1] "trasa"
-msgstr[2] "trasy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "bod"
-msgstr[1] "body"
-msgstr[2] "body"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "trasa s {0} bodem"
-msgstr[1] "trasy s {0} body"
-msgstr[2] "trasy s {0} body"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} se skládá z {1} trasy"
-msgstr[1] "{0} se skládá z {1} tras"
-msgstr[2] "{0} se skládá z {1} tras"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} bod"
-msgstr[1] "{0} bodů"
-msgstr[2] "{0} bodů"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "gps značka"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "značka"
-msgstr[1] "značky"
-msgstr[2] "značky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} se skládá z  {1} značky"
-msgstr[1] "{0} se skládá z  {1} značek"
-msgstr[2] "{0} se skládá z  {1} značek"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Synchronizovat audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Zvuk zesynchronizován na bodu {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Není možné vztvořit novou zvukovou značku"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Při pokusu o zobrazení URL pro tuto značku došlo k chybě"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL bylo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Chyba při zobrazování URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Pokročilé volby"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Ruční nastavení. Používejte s opatrností!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Hledání: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Nynějsí hodnota je výchozí"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Výchozí hodnota je''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Výchozí hodnota není známa ( ještě nebyla definována )"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Zvolte řádek k editaci"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Nová hodnota pro {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Zvolte řádek k vymazání"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Zadejte novou dvojici klíč/hodnota"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Zobraz Audio menu"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Pojmenované trasové body"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Zobrazit nebo skrýt menu Zvuk v menu hlavní nabídky."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr "Automaticky vytvořit vrstvu se značkami při otevírání GPX vrstvy."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Při importu zvuku udělat značky z..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Při importu zvuku použít záznam na značky v GPX vrstvě"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Skok dopředu/vzad (vteřiny)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Kalibrace nahrávání zvuku"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Barva"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6070,5 +5391,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6219,40 +5541,731 @@
 msgstr "Název"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Obrázky pro {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Číst GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Žádný čas pro bod {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Čtu {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Obrázky s GPS souřadnicemi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Start GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Konec GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "nynější odchylka: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "rozdíl časových pásem: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "obrázek"
+msgstr[1] "obrázky"
+msgstr[2] "obrázky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Synchronizovat hodiny"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG obrázky (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Data v souboru \"{0}\" nemohla být parsována."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "V souboru \"{0}\" není časová značka EXIF"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Obrázek"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchronizace času s GPS přijímačem"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Zadaný čas nemůže být rozparsován"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps bod"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Přizpůsobit kreslení linií"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Použít globální nastavení."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Přizpůsobit barvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Výchozí"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Zvolit barvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Značky z pojmenovaných bodů"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Pojmenované body z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importovat zvuk"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audiosoubory (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio značky z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importovat obrázky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} cest, "
+msgstr[1] "{0} cesta, "
+msgstr[2] "{0} cesty, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} trasa, "
+msgstr[1] "{0} trasy, "
+msgstr[2] "{0} trasy, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} značka"
+msgstr[1] "{0} značky"
+msgstr[2] "{0} značek"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Jméno: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Popis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Časové rozpětí: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Délka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Převést do datové vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Nahrání nezpracovaných GPS dat je považováno za poškozování projektu."
+"<br>Pokud chcete nahrát trasy, podívejte se tady:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Převedeno z: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+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:712
+msgid "Download everything within:"
+msgstr "Stáhnout vše v rozmezí:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metrů"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Maximální plocha na požadavek:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} čtverečních km"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Tato akce bude potřebovat<br>{0} samostatných stažení dat.<br>Chcete "
+"pokračovat?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Některé značky, které byly příliš daleko od trasy k rozumnému odhadu času, "
+"byly vynechány."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datová vrstva {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "mimo stažený areál"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "verze {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} se skládá z:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} smazáno.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "Verze API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Převédst do GPX vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "tras"
+msgstr[1] "trasa"
+msgstr[2] "trasy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "bod"
+msgstr[1] "body"
+msgstr[2] "body"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "trasa s {0} bodem"
+msgstr[1] "trasy s {0} body"
+msgstr[2] "trasy s {0} body"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} se skládá z {1} trasy"
+msgstr[1] "{0} se skládá z {1} tras"
+msgstr[2] "{0} se skládá z {1} tras"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} bod"
+msgstr[1] "{0} bodů"
+msgstr[2] "{0} bodů"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "gps značka"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "značka"
+msgstr[1] "značky"
+msgstr[2] "značky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} se skládá z  {1} značky"
+msgstr[1] "{0} se skládá z  {1} značek"
+msgstr[2] "{0} se skládá z  {1} značek"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Synchronizovat audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Zvuk zesynchronizován na bodu {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Není možné vztvořit novou zvukovou značku"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Při pokusu o zobrazení URL pro tuto značku došlo k chybě"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL bylo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Chyba při zobrazování URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Pokročilé volby"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Ruční nastavení. Používejte s opatrností!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Hledání: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Nynějsí hodnota je výchozí"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Výchozí hodnota je''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Výchozí hodnota není známa ( ještě nebyla definována )"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Zvolte řádek k editaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Nová hodnota pro {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Zvolte řádek k vymazání"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Zadejte novou dvojici klíč/hodnota"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Zobraz Audio menu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Pojmenované trasové body"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Zobrazit nebo skrýt menu Zvuk v menu hlavní nabídky."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr "Automaticky vytvořit vrstvu se značkami při otevírání GPX vrstvy."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Při importu zvuku udělat značky z..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "Při importu zvuku použít záznam na značky v GPX vrstvě"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Skok dopředu/vzad (vteřiny)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Kalibrace nahrávání zvuku"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Barva"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Styl kreslení {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Vrstva: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Vybrat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Zvolte barvu pro {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Nastavit na výchozí hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Nastavit vše na výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Barvy použité různými objekty v JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Barvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6261,30 +6274,30 @@
 msgstr "Všechny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Místní soubory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Žádný"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Vynutit kreslení spojnic mezi GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Kreslit větší GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rychlost (červená = pomalá, zelená = rychlá)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Nepřesnost pozice (červená = vysoká, zelená = nízká, je-li k dispozici)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna barva (může být nastavena pro pojmenované vrstvy)"
@@ -6292,5 +6305,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6311,5 +6324,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6347,5 +6360,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6358,50 +6371,50 @@
 msgstr "Pěší"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Kreslit šipky ve směru jízdy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Rychlé vykreslování (vypadá ošklivě)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Jen zajímavé směry (např. jednosměrka)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Pouze na prvním úseku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Vykreslit segmenty s pořadovými čísly"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykreslit ohraničující box stažených dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykreslovat virtuální uzly v modu výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Vykreslovat neaktivní vrstvy v jiných barvách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhlazené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Kreslit čáru mezi body GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6409,9 +6422,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6420,10 +6433,10 @@
 "kreslení všech linií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maximální délka (metrů)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6431,15 +6444,15 @@
 "Vynutit kreslení čar, pokud importovaná data neobsahují informace o čarách."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Zobrazovat šipky pro čary spojující GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Zobrazovat směrové šipky pomocí tabulek místo komplexní matematiky."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6447,13 +6460,13 @@
 msgstr "Nekreslit šipky, pokud nejsou alespoň tuto vzdálenost od předchozí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Minimální vzdálenost (pixelů)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovat větší tečky pro GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6463,9 +6476,9 @@
 "v kartě vrstev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Obarvovat body a části trasy podle rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6475,136 +6488,157 @@
 "musí tuto informaci ukládat."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Umožní ladit barvy cesty pro rozdílné průměrné rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Barvy tras a bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Zobrazovat směr u segmentů cesty."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Zobrazovat pořadí u všech segmentů v cestách."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovat hranice dat stažených ze serveru."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Vykreslovat křížky uprostřed cest ve výběrovém módu."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovat neaktivní vrstvy dat jinou barvou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Zanechávat záložní soubory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Při ukládání zanechávat záložní soubory končící znakem ~"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Zobrazovat při startu úvodní obrazovku"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Zobrazovat ID objektů v seznamech"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Vykreslovat pomocnou čáru od posledního bodu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Nepoužívat módy (styl Potlachu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Práce bez přepínání režimů (ve stylu potlatche)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Vzhled a chování"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Výchozí (automaticky)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Povolit vestavěné výchozí hodnoty"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Povolit vestavěné výchozí hodnoty"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Typ sjezdovky"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Nastavení dostupných pluginů."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Stáhnout seznam"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Konfigurovat zařízení..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Prosím, vyberte položku."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Nastavení webů s pluginy"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Nastavení zobrazení"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6612,81 +6646,81 @@
 msgstr "Různá nastavení ovlivňující vzhled celého programu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Nastavení připojení"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Nastavení připojení pro OSM server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Nastavení mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Nastavení projekce mapy a interpretace dat."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Nastavení zvuku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Nastavení pro přehrávání zvuků a zvukové značky."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Některá nastavení se projeví až po restartování JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Zobrazovat souřadnice jako"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Metoda projekce"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Projekce mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Metoda projekce"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Zobrazovat souřadnice jako"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Používat proxy server"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonymní"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Nastavení proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Adresa proxy serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Port proxy serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Uživatelské jméno pro proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Heslo pro proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Základní URL OSM serveru (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6694,17 +6728,17 @@
 "Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo ukládat."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "URL serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6719,75 +6753,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Nastavení klávesových zkratek"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Umožní nastavit klávesové zkratky ručně."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Akce"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Klávesová zkratka"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Popis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Vrstva: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Autoři: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Nápověda: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Verze {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Zkopírovat výchozí"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Vyberte řádek ke zkopírování."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Přidat nový zdroj do seznamu."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Smazat vybraný zdroj ze seznamu."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Setřídit nabídku s přednastaveními"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Povolit vestavěné výchozí hodnoty"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Zdroj přednastavených tagů"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Přidat nový zdroj přednastavených tagů na seznam."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Smazat vybraný zdroj ze seznamu."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Přednastavení tagů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Zdroje přednastavení tagů"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Oddělovač"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Panel nástrojů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Dostupné"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Upravení panelu nástrojů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Upravit prvky v panelu nástrojů."
@@ -7040,6 +7107,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7048,7 +7115,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Soubor {0} již existuje. Přepsat ?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7364,5 +7431,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7372,15 +7439,15 @@
 msgstr "{0}% ({1}/{2}), zbývá {3} . Nahrávám {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Aktualizuj pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Stáhnout pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7393,5 +7460,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7400,23 +7467,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7466,6 +7533,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Zakázat plugin"
@@ -7480,5 +7547,5 @@
 msgstr "Ponechat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7488,5 +7555,5 @@
 "jejich přepsání."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7495,10 +7562,10 @@
 "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Dle informací z pluginu je autor {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7506,9 +7573,9 @@
 "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Chcete plugin zakázat ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7518,5 +7585,5 @@
 "programu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7526,19 +7593,19 @@
 "JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Informace"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "není zádný popis"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7548,13 +7615,13 @@
 msgstr[2] "Informace o pluginech staženy z {0} sití"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Nenalezeny informace o pluginu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Všechny nainstalované pluginy jsou aktuální."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7567,9 +7634,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Stáhnout chybějící pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7582,6 +7649,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7604,14 +7671,14 @@
 msgstr "neznámý"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Verze {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin zahrnut v JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7867,45 +7934,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrahovat pozice GPS z EXIFu"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Jeden z vybraných souborů je prázdný!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Načíst fotografie..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemohu najít výchozí cesto pro adresář {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prohledávám adresář {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nalezen nulový soubor v adresáři {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Korelovat vůči GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8113,20 +8180,20 @@
 msgstr "Sekundy: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "{0} z {1} fotografií bylo dosazeno do GPX trasy."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Časový rozdíl {0} dnů)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Posun mezi trasou a fotografiemi: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8134,13 +8201,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Dosazení fotografií do trasy selhalo."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Upravit časovou zónu a posun"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Výchozí hodnoty"
@@ -8162,5 +8229,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
@@ -8505,5 +8572,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Prázdná vrstva"
@@ -8608,17 +8675,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Chyba formátu souboru"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA import úspěšný"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "NMEA import selhal!"
+msgid "TCX Files (*.tcx)"
+msgstr "Soubory GPX (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8643,5 +8712,5 @@
 msgstr "Vytvořit duplikát cesty"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Vrstva pro editaci GPX tras"
@@ -8662,11 +8731,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Importovat cestu z GPX vrstvy"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Zahodit existující cestu"
@@ -8675,6 +8744,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Nenalezena vrstva s GPX daty."
@@ -8737,6 +8806,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Obnovit"
@@ -9045,7 +9114,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "voda"
@@ -9388,14 +9457,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Otevřít OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9528,19 +9597,19 @@
 msgstr "Povolené akce"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požadavku: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povolit?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9664,7 +9733,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Nahrávám..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9858,13 +9926,4 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importovat TCX soubor..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importovat TCX soubor jako GPS trasu"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10080,33 +10139,33 @@
 msgstr "Otevře dialog umožňující skočit na zadané místo"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Zadejte šířku/délku místa kam skočit."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Můžete též vložit URL z www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Přiblížení (v metrech)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Skočit tam"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Skok na místo"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr "Nelze rozpoznat šířku, délku nebo přiblížení. Prosím, zkontrolujte."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Nelze rozpoznat šířku/délku"
@@ -10421,23 +10480,23 @@
 msgstr "Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Kontrola vlastností :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Tento plugin kontroluje chyby klíčů a jejich hodnot."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10448,5 +10507,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Neplatná kombinace klíče/hodnoty"
@@ -10454,78 +10513,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Problém s vykreslováním"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Klíč ''{0}'' je neplatný."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Klíče s prázdnými hodnotami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Neplatné klíče vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Neplatná mezera v klíči vlastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Hodnota začíná nebo končí mezerou"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Hodnota obsahuje HTML entitu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Hodnota ''{0}'' pro klíč ''{1}'' není v přednastavení"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Kontrola klíčů vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Kontroluje platnost klíčů vlastností proti seznamu slov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Použít komplexní kontrolu vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr "Kontroluje platnost hodnot a tagů pomocí komplexních pravidel."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10533,74 +10592,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Přidat nový zdroj do seznamu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Upravit zvolený zdroj."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Zdroje dat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Kontrola hodnot vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr "Kontroluje platnost hodnot vlastností proti přednastaveným hodnotám."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Zkontrolovat tagy s FIXME."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Najít cesty a body s FIXME v jakékoliv hodnotě vlastnosti."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+msgid "Use default tag ignore file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+msgid "Use the default tag ignore file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Opravit vlastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Nelze najít typ elementu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Nelze najít úroveň varování"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Neplatný výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10747,7 +10814,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "budova"
@@ -10761,5 +10828,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "oblast"
@@ -10769,25 +10836,25 @@
 msgstr "Neuzavřená cesta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Nespojené cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Tento test kontroluje na blízkost koncových uzlů cest k jiným cestám"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Koncový uzel cesty poblíž jiné silnice"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Koncový uzel cesty poblíž jiné cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Uzel cesty poblíž jiné cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Spojený koncový uzel cest poblíž jiné cesty"
@@ -10810,17 +10877,22 @@
 msgstr "Tento test hledá neotagované, prázdné a jednouzlové cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Nepojmenované cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Upravit křižovatku"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Neotagované cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Prázdné cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Cesty s jediným uzlem"
@@ -10858,14 +10930,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Nastala výjimka"
@@ -10963,5 +11035,5 @@
 msgstr "Upravit pozici zvolené WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10976,15 +11048,15 @@
 msgstr "Automatické stahování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, 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:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -10992,102 +11064,91 @@
 "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Nastavení pluginu WMS Plugin"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Jméno v menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Jméno v menu (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Zadejte jméno v menu a WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Zkopírovat výchozí"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Vyberte řádek ke zkopírování."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Stáhnout"
 
 #. *
@@ -11314,16 +11375,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Otevře soubory TCX přímo v JOSM."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytváření řadových domků z jednotlivých bloků."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11334,5 +11390,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11343,5 +11399,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11352,10 +11408,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12153,4 +12209,64 @@
 msgstr "Přístup"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "ano"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12174,5 +12290,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "soukromý"
@@ -12220,5 +12336,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "dopravní obsluha"
@@ -12255,5 +12371,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "na povolení"
@@ -12272,4 +12388,28 @@
 msgid "agricultural"
 msgstr "zemědelská vozidla"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "ne"
 
 #: build/trans_presets.java:315
@@ -12485,6 +12625,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "dálnice"
@@ -12510,6 +12650,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "4. pruhová silnice"
@@ -12535,6 +12675,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "silnice první třídy"
@@ -12560,6 +12700,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "silnice druhé třídy"
@@ -12573,5 +12713,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "silnice třetí třídy"
@@ -12589,5 +12729,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "obytná oblast"
@@ -12605,5 +12745,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "obslužná cesta"
@@ -12630,6 +12787,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "konstrukce"
@@ -12679,5 +12836,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -13656,5 +13813,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "mokřina"
@@ -15385,27 +15542,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -18243,8 +18400,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "bicykl"
@@ -18313,8 +18470,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "pěší"
@@ -18340,5 +18497,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metro"
@@ -18468,4 +18625,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18474,4 +18632,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18480,4 +18639,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18486,4 +18646,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18547,7 +18708,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "most"
@@ -18605,4 +18766,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18728,7 +18890,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18811,15 +18973,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "zastaralý"
@@ -18861,5 +19023,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "koňská"
@@ -19069,11 +19231,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "překážka"
@@ -19111,6 +19273,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "ulice"
@@ -19166,7 +19328,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "dálnice"
@@ -19222,8 +19384,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "železnice"
@@ -19244,5 +19406,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19256,5 +19418,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr "brod"
@@ -19275,5 +19437,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr ""
@@ -19288,5 +19450,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19301,5 +19463,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "říční břeh"
@@ -19313,5 +19475,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "potok"
@@ -19325,5 +19487,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr ""
@@ -19351,5 +19513,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr ""
@@ -19517,13 +19679,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr ""
@@ -19585,7 +19747,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19608,10 +19770,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19631,7 +19793,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19639,8 +19804,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19685,6 +19854,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19698,5 +19867,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminál"
@@ -19718,5 +19887,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19730,5 +19899,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19776,7 +19945,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "lanovka"
@@ -19793,5 +19962,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "lehká sjezdovka"
@@ -19806,5 +19975,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "střední sjezdovka"
@@ -19819,5 +19988,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "těžká sjezdovka"
@@ -19832,5 +20001,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19845,5 +20014,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19858,5 +20027,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "sjezdovka pro začátečníky"
@@ -19961,10 +20130,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19978,5 +20147,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "molo"
@@ -19990,5 +20159,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "potrubí"
@@ -20116,12 +20285,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr ""
@@ -20135,5 +20304,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "přísav"
@@ -20205,8 +20374,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "občanská vybavenost"
@@ -20308,10 +20477,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20697,22 +20866,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20744,6 +20913,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "menší vodní plochy"
@@ -20804,8 +20973,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "zdravotnictví"
@@ -21158,26 +21327,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "obchod"
@@ -21249,8 +21418,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotel"
@@ -21400,9 +21569,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turistika"
@@ -21474,8 +21643,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "historické"
@@ -21546,8 +21715,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "zeleň"
@@ -21561,5 +21730,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "lom"
@@ -21573,5 +21742,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "skládka"
@@ -21593,5 +21762,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "nádrže"
@@ -21605,5 +21774,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "les"
@@ -21617,5 +21786,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "zemědělství"
@@ -21638,5 +21807,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "obchody"
@@ -21650,5 +21819,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "průmysl"
@@ -21662,5 +21831,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "stará zátěž, městské ruiny (Brownfield)"
@@ -21674,5 +21843,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "Zastavitelné území (Greenfield)"
@@ -21686,5 +21855,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "železniční plochy"
@@ -21741,7 +21910,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "vojenský"
@@ -21755,5 +21924,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "hřbitov"
@@ -21766,5 +21935,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "vrchol"
@@ -21779,5 +21948,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "ledovec"
@@ -21791,5 +21960,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "sopka"
@@ -21844,8 +22013,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "přírodní"
@@ -21859,5 +22028,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "křoví"
@@ -21871,5 +22040,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "vřesoviště"
@@ -21883,5 +22052,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "Prales"
@@ -21895,5 +22064,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "bahno"
@@ -21907,5 +22076,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "pláž"
@@ -21983,8 +22152,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "cesta"
@@ -22032,7 +22201,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "hranice"
@@ -22174,10 +22343,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "místo"
@@ -22225,6 +22394,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adresa"
@@ -22455,10 +22624,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22466,5 +22635,5 @@
 msgstr "NPE Mapy"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22472,65 +22641,129 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap data"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME oprava)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Cyklostezka"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Ulice NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Vrstva dat"
+
+#~ msgid "Change"
+#~ msgstr "Změnit"
+
+#~ msgid "Rotate"
+#~ msgstr "Otočit"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Vyberte alespoň jeden uzel, cestu, nebo relaci. Pouze objekty nahrané na "
-#~ "server mají historii."
-
-#~ msgid "Selection too big"
-#~ msgstr "Výběr je příliš velký"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný."
+#~ "Projekce \"{0}\" je navržena pouze\n"
+#~ "pro zeměpisné šířky mezi 46.1° a 57°.\n"
+#~ "Použijte jiný projekční systém, pokud nepoužíváte\n"
+#~ "francouzský WMS server.\n"
+#~ "Nenáhrávejte žádná data po zobrazení této hlášky!"
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "Kartografická projekce \"{0}\" je použitelná pouze pro\n"
+#~ "zeměpisné šířky mezi 45.7° a 47.9°\n"
+#~ "a zeměpisné délky mezi 5.7° a 10.6°.\n"
+#~ "Použijte jinou projekci v JOSM, pokud nepracujete\n"
+#~ "přímo na území Švýcarska nebo Lichtenštejnska.\n"
+#~ "Od této zprávy neposílejte na server žádná data."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konflikty: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Zdroj přednastavených tagů"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Přidat nový zdroj přednastavených tagů na seznam."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Zdroje přednastavení tagů"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importovat TCX soubor..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importovat TCX soubor jako GPS trasu"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Otevře soubory TCX přímo v JOSM."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME oprava)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Nahrávám data"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Zatím neimplementováno."
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -22538,4 +22771,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Vyřešit konflikty"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
 
 #~ msgid "{0} object has conflicts:"
@@ -22577,4 +22813,19 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Vyřešit {0} konfliktů v {1} objektech"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Klikněte na obnovit pro aktualizaci seznamu"
+
+#~ msgid "Revert"
+#~ msgstr "Vrátit zpět"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22695,4 +22946,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Vyberte alespoň jeden uzel, cestu, nebo relaci. Pouze objekty nahrané na "
+#~ "server mají historii."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -22734,2 +22992,8 @@
 #~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento "
 #~ "plugin může být použit pro přípravu tras pro uploud do OSM."
+
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný."
+
+#~ msgid "Selection too big"
+#~ msgstr "Výběr je příliš velký"
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 16400)
+++ applications/editors/josm/i18n/po/da.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-22 17:24+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-06 01:43+0000\n"
 "Last-Translator: Peter Brodersen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,31 +32,32 @@
 msgstr "Hjælp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 "Projiceringen kunne ikke indlæses fra indstillingerne. Benytter Mercator."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Tip: Nogle ændringer kom ved afsendingen af nyt data til serveren"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Ugemte ændringer"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Der er ugemte ændringer. Smid ændringerne væk og fortsæt?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Gem og afslut"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Smid væk og afslut"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -69,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -88,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -99,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorerer defekt URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorerer defekt fil-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "UKENDT"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Om"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Vis \"Om\"-billedet."
@@ -132,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -143,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Seneste ændring ved {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java-version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Fejlrapporter"
@@ -171,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -177,27 +179,27 @@
 msgstr "Information"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Læsmig"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Version"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Bidrag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Om JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Filen kunne ikke findes."
@@ -211,12 +213,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Vælg mindst ét punkt eller vej."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Advarsel"
@@ -271,5 +272,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Breddegrad"
@@ -278,5 +279,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Længdegrad"
@@ -284,5 +285,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Opstil punkter i cirkel"
@@ -295,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -356,13 +357,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "Brud på API-egenskaber"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "Kunne ikke opstarte API'et. Prøv igen senere."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
 msgid "API initialization failed"
-msgstr ""
+msgstr "Opstart af API'et fejlede"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -381,7 +382,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Modstridende relation"
+msgstr "Brud på forudgående krav"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -390,37 +390,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "valgt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "hent"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom til {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom synsfeltet til {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -430,9 +430,9 @@
 msgstr "Vis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Intet valgt at  zoome ind på."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Ingen konflikter at zoome ind på."
@@ -526,37 +526,41 @@
 msgstr "Vælg venligst noget at kopiere."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Opret cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Opret cirkel ud fra tre valgte punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Vælg venligst præcis tre punkter eller en vej med præcis tre punkter."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "De punkter ligger ikke i en cirkel."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Vælg venligst præcis tre punkter eller en vej med præcis tre punkter."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Fjern"
@@ -606,5 +610,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -713,11 +717,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -728,5 +733,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Fejl"
@@ -736,30 +741,30 @@
 msgstr "Vælg en forudangivet licens"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM Online-hjælp"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Åbn i browser"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -767,19 +772,19 @@
 msgstr "Genindlæs"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Kan kun redigere hjælpesider fra JOSM Online-hjælp"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Fejl ved indlæsning af siden {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a>"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -796,18 +801,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Vis historisk information om OSM-veje eller -punkter"
+msgstr "Vis historik for veje, punkter eller relationer i OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Elementets historik"
+msgstr "Information om element"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Vis historisk information om OSM-veje eller -punkter"
+msgstr "Vis objekt-informationer om punkter, veje eller relationer i OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -870,5 +872,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Afspejl"
@@ -907,10 +909,10 @@
 msgstr "højre"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Flyt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -918,5 +920,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Kan ikke flytte objekter ud af verden."
@@ -1110,5 +1112,5 @@
 msgstr "Filen {0} eksisterer allerede. Overskriv?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1118,26 +1120,25 @@
 "venligst dette som en fejl."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dette dokument indeholder intet data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Gem alligevel"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1147,36 +1148,36 @@
 "håndteret som om, du afviste dem alle. Fortsæt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Afvis konflikter og gem"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Gem OSM-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Gem GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Gem lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Kunne ikke lave backup af fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Ukendt filtype."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "En fejl opstod under skrivning."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "En fejl opstod ved gendannelse af backup-fil."
@@ -1227,6 +1228,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Luk"
@@ -1472,68 +1474,68 @@
 msgstr "Intet er valgt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Send til OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Send alle ændringer til OSM-serveren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Tilføjede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Ændrede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Slettede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Angiv en kort kommentar for de ændringer, du uploader:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Send disse ændringer?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Send ændringer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Intet at sende. Skab først noget data."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Der er uløste konflikter. Du skal løse disse først."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Ingen ændringer at sende."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Sender"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr "Opdaterer primitiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synkronisér kun {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Synkronisér hele datasættet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1547,17 +1549,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Der er opdaget en konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "uventet svar. Modtog {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1568,10 +1570,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1581,9 +1583,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1593,18 +1595,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr "Primitiven er allerede slettet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "Upload til OSM-API'et fejlede"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1711,24 +1713,15 @@
 msgstr "Rå GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Henter data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Intet data importeret."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datalag {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Datalag"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1770,5 +1763,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1871,5 +1864,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slip museknappen for at vælge objekterne inden i firkanten."
@@ -1880,5 +1873,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Slip museknappen for at stoppe rotationen."
@@ -1894,7 +1887,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1902,9 +1895,9 @@
 msgstr "Markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Vælg, flyt og rotér objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1913,5 +1906,28 @@
 msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Flyt til venstre"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Flyt til venstre"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Fortryd"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1920,5 +1936,5 @@
 "nærmeste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1938,5 +1954,5 @@
 msgstr "Zoom og flyt kort"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2199,35 +2215,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Tilføj"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Skift"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Slet {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Ret {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Fjern \"{0}\" for {1} \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Sæt {0}={1} for {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2237,19 +2245,26 @@
 msgstr[1] "objekter"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Fjern \"{0}\" for {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Sæt {0}={1} for {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2257,25 +2272,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Slet {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Slet {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Modstridende relation"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2286,11 +2301,11 @@
 "Slet fra relation?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Slet fra relation"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2301,10 +2316,10 @@
 "Slet fra relation?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Opdel vejstykke"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2316,20 +2331,20 @@
 "måske bruger dem.<br>Vil du virkelig slette?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Flyt"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2355,44 +2370,50 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
+#, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "Fjernede element fra relationer"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Roter"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Rotate {0} {1}"
+msgstr "Slet {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sekvens"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../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:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2490,25 +2511,51 @@
 msgstr "Kunne ikke hente indstillinger fra serveren."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "parameteren \"{0}\" må ikke være en null-værdi"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "decimalgrader"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "Ø"
@@ -2519,5 +2566,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2542,5 +2589,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2639,17 +2686,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr "Fandt ikke en primitiv med id {0} i dette datasæt"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2657,16 +2700,5 @@
 msgstr "Parameteren \"{0}\" > 0 forventet, modtog \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr "parameteren \"{0}\" må ikke være en null-værdi"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2678,127 +2710,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "En vej af typen Område er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipolygon-vej \"{0}\" er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Slettede medlem \"{0}\" i relation"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vej \"{0}\" med mindre end to punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 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:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 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:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Mere end én \"via\" blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukendt rolle \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukendt medlemstype for \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Ingen \"fra\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Ingen \"til\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 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:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Ikke-vej \"{0}\" i multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ingen ydre vej for multipolygon \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Indre vej \"{0}\" er på ydersiden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "utagget"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "tekst"
@@ -2806,5 +2838,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2832,6 +2864,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "baggrund"
@@ -2841,24 +2873,9 @@
 msgstr "fremhæv"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Projiceringen \"{0}\" er kun beregnet for\n"
-"breddegrader mellem 46,1° og 57°.\n"
-"Brug et andet projiceringssystem, hvis du ikke benytter\n"
-"en fransk WMS-server.\n"
-"Upload ikke noget data efter denne besked."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2869,35 +2886,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambert-zone (Frankrig)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-zone (Estland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Projiceringen \"{0}\" er kun beregnet for\n"
-"breddegrader mellem 45,7° og47,9°.\n"
-"Brug et andet projiceringssystem, hvis du ikke arbejder\n"
-"med et datasæt fra Schweiz eller Liechtenstein.\n"
-"Upload ikke noget data efter denne besked."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Flyt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2909,14 +2915,14 @@
 msgstr "Kunne ikke gemme bogmærke."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Dagens besked er ikke tilgængelig"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- nuværende version er {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Henter \"Dagens besked\""
@@ -3109,5 +3115,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3169,5 +3174,5 @@
 msgstr "Zoom ud"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skalér"
@@ -3201,8 +3206,13 @@
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "lag er ikke i listen"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3210,9 +3220,9 @@
 msgstr "Kontakter OSM-serveren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Fejl ved fortolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Filen blev ikke fundet"
@@ -3273,4 +3283,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3280,4 +3291,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "Punkter"
@@ -3285,5 +3298,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Medlemmer"
@@ -3479,7 +3493,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3559,4 +3573,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3564,4 +3581,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3571,4 +3589,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3597,7 +3616,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Forbindelsen mislykkedes."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3679,22 +3697,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
-#, fuzzy
 msgid "visible (on the server)"
-msgstr "Primitiven er slettet på serveren"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
-#, fuzzy
 msgid "not visible (on the server)"
-msgstr "Primitiven er slettet på serveren"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Indtast et navn for stedet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
-#, fuzzy
 msgid "Physically delete from local dataset"
-msgstr "Min version (lokalt datasæt)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
@@ -3723,18 +3737,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
-#, fuzzy
 msgid "Keep my visible state"
-msgstr "Behold mine koordinater"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Ja, gendan også dem"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Ingen dato"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3751,7 +3762,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
-#, fuzzy
 msgid "Keep their visible state"
-msgstr "Behold deres koordinater"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
@@ -3767,7 +3777,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "fjern fra valgte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3778,9 +3787,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rolle"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitiv"
@@ -3798,4 +3809,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<udefineret>"
@@ -3819,8 +3832,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3831,7 +3844,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3887,5 +3901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Kommando-stak"
@@ -3896,6 +3910,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3906,5 +3920,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3913,10 +3927,29 @@
 msgstr "Skift: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Kommando-stak: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Sammenfletnings-konflikter."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Løs"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Åben en fletnings-dialogboks for alle valgte elementer i den ovenstående "
+"liste."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3924,28 +3957,4 @@
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Løs"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Åben en fletnings-dialogboks for alle valgte elementer i den ovenstående "
-"liste."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Sammenfletnings-konflikter."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konflikter: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -3982,44 +3991,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Tryk Genindlæs for at genopfriske listen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Vis historikken for alle valgte elementer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Dato"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Genindlæs alle valgte objekter og genopfrisk listen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Tilbagefør"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Returnér alle valgte objekter til den version, der er valgt i historiklisten."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Endnu ikke implementeret."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4152,4 +4165,18 @@
 msgid "Add Properties"
 msgstr "Tilføj egenskaber"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Tilføj"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4262,14 +4289,14 @@
 msgstr "Valgt: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Frigør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik for at minimere/maksimere panelet"
@@ -4299,179 +4326,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Anvend ændringer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Grundlæggende"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Optaget af"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (tom værdi fjerner tag)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Flyt op"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Flyt det nuværende valgte medlem op"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Tilføj valgte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Tilføj alle valgte objekter som medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Fjern valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Fjern alle valgte objekter fra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Slet den valgte kilde fra listen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Flyt ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Flyt det nuværende valgte medlem ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Fjern medlemmet i den nuværende tabelrække fra denne relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Hent medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hent alle ufuldstændige veje og punkter der er forbundet"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "nej"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Medlemmer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relations-editor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Der var konflikter ved import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Fejl i fortolkning af server-svar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Kan ikke forbinde til serveren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4506,21 +4456,21 @@
 msgstr "Vælg først et bogmærke"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min. bredde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min. længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "maks. bredde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "maks. længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4530,5 +4480,5 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Omkransende område"
@@ -4679,662 +4629,41 @@
 msgstr "Tern-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Billeder for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Indlæs GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Intet tidspunkt for punkt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Ingen billeder med læsbare tidsstempler fundet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Indlæser {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Geotaggede billeder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS-start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS-slut: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "nuværende forskel: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "tidszone-forskel: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "billede"
-msgstr[1] "billeder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} inden for sporet."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Synkronisér ur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-billeder (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Datoen i filen \"{0}\" kunne ikke forstås."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Billede"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS-enhedens tidszone (forskel fra foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synkronisér tidspunkt med GPS-enhed"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Den indtastede tid kunne ikke forstås."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps-punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Tilpas linjetegning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Brug globale indstillinger."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Vælg linjetegnings-indstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Tilpas farve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Vælg en farve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Markører fra navngivne punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Navngivne punkter fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importér lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-lydfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Lyd-markører fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importér billeder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} spor, "
-msgstr[1] "{0} spor, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rute, "
-msgstr[1] "{0} ruter, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Navn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivelse: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Tidshorisont: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Længde: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Konvertér til datalag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Upload af ubehandlet GPS-data som kortdata betragtes som skadeligt "
-"<br>Hvis du vil uploade traces, så kig her:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Konverteret fra: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Hent fra OSM langs dette spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Hent alt inden for:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} meter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>This handling kræver {0} individuelle<br>download-anmodninger. Ønsker "
-"du<br>at fortsætte?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "uden for det hentede område"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "version {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "Der var {0} konflikter under import."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} består af:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} slettet.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "API-version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Konvertér til GPX-lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "spor"
-msgstr[1] "spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punkt"
-msgstr[1] "punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "et spor med {0} punkt"
-msgstr[1] "et spor med {0} punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} består af {1} spor"
-msgstr[1] "{0} består af {1} spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "GPS-markør"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "markør"
-msgstr[1] "markører"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} består af {1} markør"
-msgstr[1] "{0} består af {1} markører"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Synkronisér lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-"Du skal sætte lyden på pause i det øjeblik, du hører synkroniserings-"
-"angivelsen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Lyd synkroniseret på punkt {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-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:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-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:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Ingen eksisterende lydmarkører i dette lag at forskyde ud fra."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Kan ikke sætte ny audio-markør"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Der opstod en fejl i forsøget på at vise URL'en for denne markør"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL var: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Fejl ved visning af URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Udvidede indstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Ret indstillingerne direkte. Vær varsom!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Søg: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Nuværende værdi er standard."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Standardværdien er \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Standardværdien er i øjeblikket ukendt (indstillingen har ikke været i brug "
-"endnu)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Vælg venligst rækken, der skal rettes."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Ny værdi for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Vælg venligst rækken, der skal slettes"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Indtast et nyt nøgle/værdi-sæt"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Vis lyd-menuen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Marker lyd- (og billede- og web-)markører."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Vis live lydspor."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Opret ikke-lydmarkører, når GPX-data læses."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Vis eller skjul lydmenu-punktet i hovedmenu-baren"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Når lyd importeres, opret markører ud fra..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Når lyd importeres, tilknyt den til ethvert vejpunkt i GPX-laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Tid for indføring (sekunder)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Farve"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6044,5 +5373,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6193,40 +5523,723 @@
 msgstr "Navn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Billeder for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Indlæs GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Intet tidspunkt for punkt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Ingen billeder med læsbare tidsstempler fundet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Indlæser {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Geotaggede billeder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS-start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS-slut: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "nuværende forskel: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "tidszone-forskel: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "billede"
+msgstr[1] "billeder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} inden for sporet."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Synkronisér ur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-billeder (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Datoen i filen \"{0}\" kunne ikke forstås."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Billede"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS-enhedens tidszone (forskel fra foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synkronisér tidspunkt med GPS-enhed"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Den indtastede tid kunne ikke forstås."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps-punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Tilpas linjetegning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Brug globale indstillinger."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Vælg linjetegnings-indstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Tilpas farve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Vælg en farve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Markører fra navngivne punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Navngivne punkter fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importér lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-lydfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Lyd-markører fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importér billeder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} spor, "
+msgstr[1] "{0} spor, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rute, "
+msgstr[1] "{0} ruter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Navn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Tidshorisont: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Længde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Konvertér til datalag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Upload af ubehandlet GPS-data som kortdata betragtes som skadeligt "
+"<br>Hvis du vil uploade traces, så kig her:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Konverteret fra: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Hent fra OSM langs dette spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Hent alt inden for:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} meter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>This handling kræver {0} individuelle<br>download-anmodninger. Ønsker "
+"du<br>at fortsætte?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datalag {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "uden for det hentede område"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Der var {0} konflikter under import."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} består af:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} slettet.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "API-version: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Konvertér til GPX-lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "spor"
+msgstr[1] "spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punkt"
+msgstr[1] "punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "et spor med {0} punkt"
+msgstr[1] "et spor med {0} punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} består af {1} spor"
+msgstr[1] "{0} består af {1} spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "GPS-markør"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "markør"
+msgstr[1] "markører"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} består af {1} markør"
+msgstr[1] "{0} består af {1} markører"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Synkronisér lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+"Du skal sætte lyden på pause i det øjeblik, du hører synkroniserings-"
+"angivelsen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Lyd synkroniseret på punkt {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+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:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+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:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Ingen eksisterende lydmarkører i dette lag at forskyde ud fra."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Kan ikke sætte ny audio-markør"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Der opstod en fejl i forsøget på at vise URL'en for denne markør"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL var: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Fejl ved visning af URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Udvidede indstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Ret indstillingerne direkte. Vær varsom!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Søg: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Nuværende værdi er standard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Standardværdien er \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Standardværdien er i øjeblikket ukendt (indstillingen har ikke været i brug "
+"endnu)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Vælg venligst rækken, der skal rettes."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Ny værdi for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Vælg venligst rækken, der skal slettes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Indtast et nyt nøgle/værdi-sæt"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Vis lyd-menuen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Marker lyd- (og billede- og web-)markører."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Vis live lydspor."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Opret ikke-lydmarkører, når GPX-data læses."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Vis eller skjul lydmenu-punktet i hovedmenu-baren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Når lyd importeres, opret markører ud fra..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "Når lyd importeres, tilknyt den til ethvert vejpunkt i GPX-laget."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Tid for indføring (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Farve"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Lag: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Vælg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Vælg en farve for {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Sæt til standardværdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Sæt alle til standardværdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Farver brugt af forskellige objekter i JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Farver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6235,29 +6248,29 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Ingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Fremtving linjer, hvis ingen segmenter blev importeret."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighed (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Opløsning af position (rød = høj, grøn = lav, hvis tilgængelig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkelt farve (kan justeres for navngivne lag)"
@@ -6265,5 +6278,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6284,5 +6297,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6320,5 +6333,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6331,50 +6344,50 @@
 msgstr "Gående"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspile."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig optegning (ser grimmere ud)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Kun relevante retningsvisere (fx ved ensrettede veje)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Kun ved enden af vejen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Tegn numre for segment-rækkefølgen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn omfang af hentet data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle punkter i valg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i anden farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Udglattet kortgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellem rå GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6384,9 +6397,9 @@
 "at tegne alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Maksimal længde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6395,20 +6408,20 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maksimal længde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspile for linjer, som forbinder GPS-punkter."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6416,5 +6429,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6422,13 +6435,13 @@
 msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Mindste afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6437,9 +6450,9 @@
 "Alle punkter og spor-segmenter får samme farve. Kan justeres i Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Farvelægger punkter og spor efter hastighed."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6449,37 +6462,37 @@
 "sporingsenhed skal logge denne information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Farvelægning af spor og punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningsvisere på vejstykker"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Brug udjævning på kortvisningen for et mere glat udseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omridset af data hentet fra serveren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6487,99 +6500,119 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en anden farve."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Behold backup-filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Gem backup-filer med ~ i slutningen af filnavnet, når der gemmes"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Vis startbillede ved opstart"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Vis objekt-ID i lister"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Tegn elastik-hjælpelinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Transaktionsløs tilstand (Potlatch-metode)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Udseende"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Standard (automatisk valgt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Sprog"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Brug indbyggede standarder"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Brug indbyggede standarder"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Indstil tilgængelige udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Hent liste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Opdater"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Indstil sites..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr "Tilføj JOSM-udvidelsers beskrivelses-URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr "Ret JOSM-udvidelesers beskrvelses-URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Indstil udvidelses-sites"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Indstillinger for visning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6589,81 +6622,81 @@
 "prorammet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Indstillinger for forbindelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Indstillinger for forbindelse til OSM-serveren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Indstillinger for kort"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Indstilinger for projicering af kort og datafortolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Lydindstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Indstillinger for lydafspiller og lydmarkører"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Vis koordinater som"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Projicerings-metode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Kort-projicering"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Projicerings-metode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Vis koordinater som"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Aktiver proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Proxy-indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Proxyserver-vært"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Proxyserver-port"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Proxyserver-brugernavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Proxyserver-kodeord"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Basis URLen for OSM serveren (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Login-navn (e-mail) til OSM-kontoen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6672,17 +6705,17 @@
 "kodeord."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Grundlæggende URL til server"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr "OSM-brugernavn (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM-kodeord"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6697,75 +6730,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Indstillinger for genveje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Ret tastaturgenveje manuelt"
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Handling"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Genvej"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
-msgid "Sort presets menu"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Brug indbyggede standarder"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Lag: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Forfattere: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Hjælp: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Kopier standardværdi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Vælg venligst rækken, som skal kopieres."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Tilføj en ny kilde til listen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
 msgid "Delete the selected source from the list."
 msgstr "Slet den valgte kilde fra listen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+msgid "Sort presets menu"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Separator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Værktøjslinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Tilgængelige"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Tilpasning af værktøjslinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Tilpas elementerne på værktøjslinjen."
@@ -7023,6 +7089,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7031,7 +7097,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Filen {0} eksisterer allerede. Overskriv?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7347,5 +7413,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7355,15 +7421,15 @@
 msgstr "{0}% ({1}/{2}), {3} tilbage. Uploader {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Opdater udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Hent udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7376,5 +7442,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7383,23 +7449,23 @@
 msgstr[1] "{0} udvidelser blev succesfuldt hentet ned. Genstart venligst JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Henter udvidelsen {0}..."
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "JOSM-version {0} er krævet for udvidelsen {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Download Plugin"
 msgstr "Hent udvidelse"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7449,6 +7515,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Deaktivér udvidelse."
@@ -7463,5 +7529,5 @@
 msgstr "Behold udvidelse"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7471,5 +7537,5 @@
 "til at overskrive de eksisterende udvidelser."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7477,10 +7543,10 @@
 msgstr "En uventet fejl opstod, som kan stamme fra \"{0}\"-udvidelsen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Ifølge udvidelsen medfølgende information, så er {0} forfatteren."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7489,9 +7555,9 @@
 "fejlrapport."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Skal udvidelsen deaktiveres?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7501,5 +7567,5 @@
 "udvidelsen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7509,19 +7575,19 @@
 "fra, om problemet."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Oplysninger"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "Ingen beskrivelse er tilgængelig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "Flere detaljer"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7530,13 +7596,13 @@
 msgstr[1] "Hent udvidelsesinformationer fra {0} sites"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Ingen udvidelsesinformationer blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Alle installerede udvidelser er opdaterede."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7549,9 +7615,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Hent manglende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7564,6 +7630,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7586,14 +7652,14 @@
 msgstr "ukendt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Udvidelse som følger med JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7851,45 +7917,45 @@
 "{0} km/t"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Trækker GPS-lokaliteter ud fra EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Indlæs billeder..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kan ikke hente den kanoniske sti for mappen {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tjekker mappen {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fandt en null-fil i mappen {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Sammenhold med GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8098,20 +8164,20 @@
 msgstr "Sekunder: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Tidsforskel på {0} dage)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Forskydning mellem spor og billeder: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8119,13 +8185,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Justér tidszone og forskydning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Standardværdier"
@@ -8147,5 +8213,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Fejl ved indlæsning af fil"
@@ -8486,5 +8552,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Tomt lag"
@@ -8587,17 +8653,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Fil format fejl"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA-import succesfuld"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Fejl ved NMEAimport!"
+msgid "TCX Files (*.tcx)"
+msgstr "GPX-filer (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8622,5 +8690,5 @@
 msgstr "Opret kopi af vej"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8641,11 +8709,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Importér rute fra GPX-lag"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Slet eksisterende rute"
@@ -8654,6 +8722,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Intet GPX-datalag blev fundet"
@@ -8716,6 +8784,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Opdater"
@@ -9021,7 +9089,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "vand"
@@ -9351,14 +9419,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Åbn OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9488,19 +9556,19 @@
 msgstr "Tilladte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Anmod om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Vil du tillade dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9624,7 +9692,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Uploader..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9813,13 +9880,4 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importér TCX-fil..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importér TCX-fil som GPS-spor"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10028,33 +10086,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Indtast længde/bredde for at springe til position."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Du kan også indsætte en URL fra www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoom (i meter)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Spring hertil"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Hop til position"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr "Kunne ikke aflæse længde, bredde eller zoom. Tjek venligst."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Kunne ikke aflæse længde/bredde"
@@ -10372,23 +10430,23 @@
 "Denne test tjekker for veje med lignende navne, som kan være stavet forkert."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Egenskabstjekker:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Denne udvidelse tjekker for fejl i egenskabsnøgler og -værdier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ugyldig tagtjekker-linje - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ugyldig stavefejlskontrol-linje: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10399,5 +10457,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Ugyldig kombination af tag/værdi"
@@ -10405,78 +10463,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Farvelægger problem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Nøgle \"{0}\" er ugyldig"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Tags med tomme værdier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Ulovlig egenskabsnøgle"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Ulovligt blanktegn i egenskabsnøgle"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Egenskabsværdi begynder eller slutter med blanktegn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Egenskabsværdi indeholder HTML-kodet tegn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Nøglen \"{0}\" er ikke kendt i forudindstillingerne"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Forudindstillingerne rummer ikke egenskabs-nøglen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Værdien \"{0}\" for nøglen \"{1}\" findes ikke i forudindstillingerne"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Værdien er ikke kendt i forudindstillingerne"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Tjek egenskabsnøgler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Bekræft egenskabsnøglernes gyldighed op imod en ordliste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Brug kompleks egenskabs-tjekker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "TagChecker-kilde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10484,74 +10542,84 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Tilføj en ny kilde til listen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Ret den valgte kilde."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Datakilder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Tjek egenskabsværdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Tjek for FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Søger efter punkter eller veje med FIXME i enhver egenskavsværdi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Brug standard-datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Brug standard-datafilen (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Brug standard-datafil."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Brug standard-datafilen (anbefales)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Brug standard-fil for stavekontrol."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Brug standard-filen for stavekontrol (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Ret egenskaber"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Kunne ikke finde element-typen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Kunne ikke finde advarsels-niveau"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ugyldigt udtryk ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10696,7 +10764,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "bygning"
@@ -10710,5 +10778,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "område"
@@ -10718,26 +10786,26 @@
 msgstr "Uafsluttet vej"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Uforbundne veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Denne test undersøger om en vej har et slutpunkt meget tæt på en anden vej."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Vejens slutpunkt tæt på anden landevej."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Vejens slutpunkt nær anden vej."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Vejpunkt tæt på anden vej"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Forbundet vejs slutpunkt tæt på anden vej"
@@ -10760,17 +10828,22 @@
 msgstr "Denne test tjekker for utaggede, tomme og enkeltpunkts-veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Unavngivne veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Ret trafikknudepunkt"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Utaggede veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Tomme veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Enkeltpunkts-veje"
@@ -10808,14 +10881,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "En undtagelse opstod"
@@ -10913,5 +10986,5 @@
 msgstr "Tilpas positionen for det valgte WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10924,15 +10997,15 @@
 msgstr "Automatisk download"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lag ({0}), henter til zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -10941,102 +11014,91 @@
 "opløsningen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Hent synlige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Skift opløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Genhent fejlagtige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alpha-kanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Gem WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Hent WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Fil format fejl"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Åbn et tomt WMS-lag for at hente data fra en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Indstillinger for WMS-udvidelse"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Ret listen over WMS-servere, som vises i WMS-udvidelsesmenuen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Navn på menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Navn på menu (standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Kopier standardværdi"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Vælg venligst rækken, som skal kopieres."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% af bredde:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% af længde:"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Hent"
 
 #. *
@@ -11260,16 +11322,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Hent TCX-filer direkte fra JOSM."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Laver rækkehuse ud af en enkelt blok."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11278,5 +11335,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11287,5 +11344,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11296,10 +11353,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:67
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Let download langs en lang serie af forbundne veje"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:69
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12097,4 +12154,64 @@
 msgstr "Adgang"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "ja"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12118,5 +12235,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "privat"
@@ -12164,5 +12281,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "destination"
@@ -12199,5 +12316,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "tilladt"
@@ -12216,4 +12333,28 @@
 msgid "agricultural"
 msgstr "landbrug"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "nej"
 
 #: build/trans_presets.java:315
@@ -12429,6 +12570,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "motorvej"
@@ -12454,6 +12595,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "forbindelse"
@@ -12479,6 +12620,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "primær"
@@ -12504,6 +12645,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "sekundær"
@@ -12517,5 +12658,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "tertiær"
@@ -12533,5 +12674,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "beboelse"
@@ -12549,5 +12690,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12574,6 +12732,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr ""
@@ -12623,5 +12781,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "rundkørsel"
@@ -13600,5 +13758,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr ""
@@ -15329,27 +15487,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -18187,8 +18345,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "cykel"
@@ -18257,8 +18415,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "fod"
@@ -18284,5 +18442,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "undergrundsbane"
@@ -18412,4 +18570,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18418,4 +18577,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18424,4 +18584,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18430,4 +18591,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18491,7 +18653,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "bro"
@@ -18549,4 +18711,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18672,7 +18835,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18755,15 +18918,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr ""
@@ -18805,5 +18968,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "hest"
@@ -19013,11 +19176,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -19055,6 +19218,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "gade"
@@ -19110,7 +19273,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -19166,8 +19329,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "bane"
@@ -19188,5 +19351,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19200,5 +19363,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19219,5 +19382,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr ""
@@ -19232,5 +19395,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19245,5 +19408,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "flodbred"
@@ -19257,5 +19420,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr ""
@@ -19269,5 +19432,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr ""
@@ -19295,5 +19458,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "akvædukt"
@@ -19461,13 +19624,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "menneskeskabt"
@@ -19529,7 +19692,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19552,10 +19715,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19575,7 +19738,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19583,8 +19749,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19629,6 +19799,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19642,5 +19812,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminal"
@@ -19662,5 +19832,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19674,5 +19844,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19720,7 +19890,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr ""
@@ -19737,5 +19907,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19750,5 +19920,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19763,5 +19933,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19776,5 +19946,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19789,5 +19959,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19802,5 +19972,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -19905,10 +20075,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19922,5 +20092,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr ""
@@ -19934,5 +20104,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "rørledning"
@@ -20060,12 +20230,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "rekreation"
@@ -20079,5 +20249,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "marina"
@@ -20149,8 +20319,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20252,10 +20422,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20641,22 +20811,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20688,6 +20858,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20748,8 +20918,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "helbred"
@@ -21102,26 +21272,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "butik"
@@ -21193,8 +21363,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotel"
@@ -21344,9 +21514,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turisme"
@@ -21418,8 +21588,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "historisk"
@@ -21490,8 +21660,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21505,5 +21675,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "stenbrud"
@@ -21517,5 +21687,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr ""
@@ -21537,5 +21707,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr ""
@@ -21549,5 +21719,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "skov"
@@ -21561,5 +21731,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21582,5 +21752,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr ""
@@ -21594,5 +21764,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "industri"
@@ -21606,5 +21776,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21618,5 +21788,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21630,5 +21800,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21685,7 +21855,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "militær"
@@ -21699,5 +21869,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "kirkegård"
@@ -21710,5 +21880,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr ""
@@ -21723,5 +21893,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "gletsjer"
@@ -21735,5 +21905,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "vulkan"
@@ -21788,8 +21958,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr ""
@@ -21803,5 +21973,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "buskads"
@@ -21815,5 +21985,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "hede"
@@ -21827,5 +21997,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "træ"
@@ -21839,5 +22009,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr ""
@@ -21851,5 +22021,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "strand"
@@ -21927,8 +22097,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr ""
@@ -21976,7 +22146,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "grænse"
@@ -22118,10 +22288,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "sted"
@@ -22169,6 +22339,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adresse"
@@ -22399,10 +22569,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Åbn luftkort"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22410,5 +22580,5 @@
 msgstr "NPE-kort"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22416,80 +22586,122 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap-data"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Cykelsti"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr ""
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Datalag"
+
+#~ msgid "Change"
+#~ msgstr "Skift"
+
+#~ msgid "Rotate"
+#~ msgstr "Roter"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede "
-#~ "elementer har en historik."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Gendanner vej..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Tjekker om punktet {0} er væk ..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Gendanner relation..."
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Tjekker om primitiven {0} er væk ..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Behold mine"
-
-#~ msgid "Delete mine"
-#~ msgstr "Slet mine"
-
-#~ msgid "Selection too big"
-#~ msgstr "Der er valgt for meget"
+#~ "Projiceringen \"{0}\" er kun beregnet for\n"
+#~ "breddegrader mellem 46,1° og 57°.\n"
+#~ "Brug et andet projiceringssystem, hvis du ikke benytter\n"
+#~ "en fransk WMS-server.\n"
+#~ "Upload ikke noget data efter denne besked."
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "Projiceringen \"{0}\" er kun beregnet for\n"
+#~ "breddegrader mellem 45,7° og47,9°.\n"
+#~ "Brug et andet projiceringssystem, hvis du ikke arbejder\n"
+#~ "med et datasæt fra Schweiz eller Liechtenstein.\n"
+#~ "Upload ikke noget data efter denne besked."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konflikter: {0}"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importér TCX-fil..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importér TCX-fil som GPS-spor"
+
+#~ msgid "% of lat:"
+#~ msgstr "% af bredde:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% af længde:"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Hent TCX-filer direkte fra JOSM."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
 
 #~ msgid "Uploading data"
 #~ msgstr "Sender data"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Endnu ikke implementeret."
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -22497,4 +22709,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Udred konflikter"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
 
 #~ msgid "{0} object has conflicts:"
@@ -22535,4 +22750,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Løs {0} konflikter i {1} objekter"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Tryk Genindlæs for at genopfriske listen"
+
+#~ msgid "Revert"
+#~ msgstr "Tilbagefør"
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Returnér alle valgte objekter til den version, der er valgt i "
+#~ "historiklisten."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22689,4 +22920,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede "
+#~ "elementer har en historik."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -22713,2 +22951,23 @@
 #~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>. eller i <a "
 #~ "href=\"{1}\">dit eget sprog</a>."
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "Gendanner vej..."
+
+#~ msgid "Checking whether node {0} is gone ..."
+#~ msgstr "Tjekker om punktet {0} er væk ..."
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "Gendanner relation..."
+
+#~ msgid "Checking whether primitive {0} is gone ..."
+#~ msgstr "Tjekker om primitiven {0} er væk ..."
+
+#~ msgid "Keep mine"
+#~ msgstr "Behold mine"
+
+#~ msgid "Delete mine"
+#~ msgstr "Slet mine"
+
+#~ msgid "Selection too big"
+#~ msgstr "Der er valgt for meget"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 16400)
+++ applications/editors/josm/i18n/po/de.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-27 12:12+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-07 09:11+0000\n"
+"Last-Translator: alexanderklar <Unknown>\n"
 "Language-Team: <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
-msgstr "Erzeuge Hauptfenster"
+msgstr "Hauptfenster erzeugen"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,33 +32,34 @@
 msgstr "Hilfe"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 "Die Projektion kann nicht aus den Einstellungen ermittelt werden. Verwende "
 "Merkartor"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
-msgstr "Ungesicherte Änderungen"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+msgstr "Ungespeicherte Änderungen"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
-msgstr "Es gibt ungesicherte Daten. Änderungen verwerfen und fortfahren?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+msgstr "Es gibt ungespeicherte Daten. Änderungen verwerfen und fortfahren?"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Speichern und Beenden"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Verwerfen und Beenden"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -71,12 +72,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -90,7 +91,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -101,32 +102,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoriere die ungültige URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoriere die ungültige Datei-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "UNBEKANNT"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Über"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Über dieses Programm"
@@ -134,10 +135,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -145,25 +146,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Letzte Änderung am {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java-Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Webseite"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Fehler melden"
@@ -173,5 +175,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -179,27 +181,27 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Bitte lesen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Version"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Mitwirkende"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Über JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Datei wurde nicht gefunden."
@@ -211,14 +213,18 @@
 "OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"Achtung: Unbekanntes Format der API-URL. Die Weiterleitung zur OSM-"
+"Änderungsseite des Elements könnte fehlschlagen.\r\n"
+"API-URL ist: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Bitte mindestens einen Weg oder Knoten wählen."
+msgstr ""
+"Bitte mindestens ein bereits zum Server hochgeladenes Element (Knoten, Weg "
+"oder Relation) auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Warnung"
@@ -230,4 +236,6 @@
 "primitives only"
 msgstr ""
+"Achtung: Nur die ersten {0} von {1} markierten Elementen werden im Browser "
+"angezeigt."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -273,5 +281,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Breitengrad"
@@ -280,5 +288,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Längengrad"
@@ -286,5 +294,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Knotenpunkte im Kreis anordnen"
@@ -297,5 +305,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -354,17 +362,19 @@
 "{0}, max is {1}"
 msgstr ""
+"Aktuelle Anzahl an Modifikationen ({0}) überschreitet die maximale Anzahl "
+"({1})."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "Unvereinbarkeit den Fähigkeiten der API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "API-Initialisierung fehlgeschlagen - bitte später versuchen"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
 msgid "API initialization failed"
-msgstr ""
+msgstr "API-Initialisierung fehlgeschlagen"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -374,4 +384,6 @@
 "{1}"
 msgstr ""
+"Achtung: Der Wert der Eigenschaft \"{0}\" des Elements {1} wird automatisch "
+"abgeschnitten"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
@@ -381,9 +393,10 @@
 "length {2}. Values length is {3}."
 msgstr ""
+"Länge des Wertes ({3}) der Eigenschaft \"{0}\" von Element {1} überschreitet "
+"die maximal erlaubte Länge ({2})."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Vorbedingung nicht erfüllt"
+msgstr "Unvereinbarkeit mit notwendigen Voraussetzungen"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -391,38 +404,40 @@
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+"Anzahl {0} der Knoten in Weg {1} überschreitet maximal erlaubte Knotenanzahl "
+"({2})"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "Ebene"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "heruntergeladene Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Auf {0} zoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Ansicht auf {0} zoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -432,9 +447,9 @@
 msgstr "Anzeige: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Nichts ausgewählt, auf das gezoomt werden kann."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Keine Konflikte, auf die gezoomt werden kann."
@@ -528,39 +543,43 @@
 msgstr "Bitte etwas zum Kopieren auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Kreis erstellen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 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:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr "Diese Knoten sind nicht in einem Kreis angeordnet."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 "Bitte genau drei Knoten oder einen Weg mit genau drei Knotenpunkten "
 "auswählen."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "Diese Knoten sind nicht in einem Kreis angeordnet."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Entfernen"
@@ -610,5 +629,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -717,11 +736,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -732,5 +752,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Fehler"
@@ -740,30 +760,30 @@
 msgstr "Eine vordefinierte Lizenz auswählen"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM-Onlinehilfe"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Im Browser öffnen"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -771,19 +791,19 @@
 msgstr "Neu laden"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Sie können nur die Hilfeseiten der JOSM-Onlinehilfe bearbeiten."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Fehler beim Laden der Seite {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> Sprache erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -800,18 +820,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Geschichte der OSM-Wege oder -Knoten anzeigen."
+msgstr "Die History der Wege, Knoten oder Relationen anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Geschichte des Elements"
+msgstr "Elementinformation"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Geschichte der OSM-Wege oder -Knoten anzeigen."
+msgstr "Informationen über  Wege, Knoten oder Relationen anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -874,5 +891,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Spiegeln"
@@ -911,10 +928,10 @@
 msgstr "rechts"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "{0} verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -922,5 +939,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
@@ -1116,5 +1133,5 @@
 msgstr "Datei {0} existiert bereits. Überschreiben?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1124,26 +1141,25 @@
 "no layer.\""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Leeres Dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Das Dokument enthält keine Daten."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Trotzdem speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konflikte"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1153,36 +1169,36 @@
 "Sollen alle Konflikte abgewiesen werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Konflikte abweisen und speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "OSM-Datei speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "GPX-Datei speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Ebene speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Sicherung der Datei konnte nicht erstellt werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Dateiendung unbekannt."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Beim Speichern ist ein Fehler aufgetreten."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten."
@@ -1234,6 +1250,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Schließen"
@@ -1307,12 +1324,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen Wege "
-"kopiert.\n"
-"Sie sollten dies überprüfen und falls nötig korrigieren."
+"Alle neuen Wege wurden zum Mitglied in einer Relation gemacht.\n"
+"Bitte prüfen und korrigieren Sie dies ggf."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1328,5 +1343,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 msgid "Draw lines between raw gps points."
-msgstr "Zeichne Linien zwischen rohen GPS-Punkten."
+msgstr "Zeichne Linien zwischen GPS-Rohdatenpunkten."
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
@@ -1498,68 +1513,68 @@
 msgstr "Auswahl leer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Zum OSM-Server hochladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Alle Änderungen zum OSM-Server hochladen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Neue Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Geänderte Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Zu löschende Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Diese Änderungen hochladen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Änderungen hochladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Nichts geändert. Erfassen Sie erst einige Daten."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Es gibt ungelöste Konflikte, die zuerst aufgelöst werden müssen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Keine Änderungen zum Hochladen vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Hochladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr "Objekt aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Nur {0} {1} synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Ganzen Datensatz synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1582,17 +1597,17 @@
 "weiterzuarbeiten.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Konflikt festgestellt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Unerwarteter Rückgabewert: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1608,10 +1623,10 @@
 "weiterzuarbeiten.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1624,9 +1639,9 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr "Vorbedingung nicht erfüllt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1639,9 +1654,9 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr "Objekt bereits gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -1649,9 +1664,9 @@
 "Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "Hochladen zu OSM-API fehlgeschlagen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1756,26 +1771,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78
 msgid "Raw GPS data"
-msgstr "Rohe GPS-Daten"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+msgstr "GPS-Rohdaten"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Daten herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Keine Daten importiert."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datenebene {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap-Daten"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Datenebene"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1793,5 +1799,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>There are {0} primitives in your local dataset which<br>might be "
@@ -1801,11 +1807,10 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
-"<html>Es gibt {0} Objekte im lokalen Datensatz die<br>auf dem Server "
-"möglicherweise gelöscht sind. Wenn diese<br>\r\n"
-"Objekte erst später aktualisiert oder gelöscht werden ist<br>ein Konflikt "
-"sehr wahrscheinlich.<br><br>Kicken Sie auf <strong>{1}</strong> um die "
-"Objekte einzeln zu überprüfen.<br>Kicken Sie auf <strong>{2}</strong> um "
-"diese Meldung zu ignorieren.<br>\r\n"
-"</html>"
+"<html>Im lokalen Datensatz befinden sich {0} Elemente welche auf dem Server "
+"möglicherweise gelöscht wurden.<br>Beim späteren Versuch diese hochzuladen "
+"wird der Server sehr wahrscheinlich einen Konflikt melden.<br><br>Auf "
+"<strong>{1}</strong> klicken um den Status der Elemente auf dem Server zu "
+"überprüfen.<br>Auf <strong>{2}</strong> klicken um das Problem zu "
+"ignorieren<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
@@ -1824,5 +1829,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1925,5 +1930,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
@@ -1935,5 +1940,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Maustaste loslassen, um das Drehen zu stoppen."
@@ -1951,7 +1956,7 @@
 "Zusätzliches Drücken der Umschalttaste synchronisiert Audio an diesem Punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1959,9 +1964,9 @@
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Objekte auswählen, verschieben, und drehen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1970,5 +1975,28 @@
 msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Nach links verschieben"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Nach links verschieben"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Rückgängig"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1977,5 +2005,5 @@
 "Punkt vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1994,5 +2022,5 @@
 msgstr "Zoomen und Karte verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2272,35 +2300,27 @@
 msgstr "Bei der Verbindung zum Server \"{0}\" ist ein Fehler aufgetreten."
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Ändern"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "{0} {1} löschen"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Ändere {0} Objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "\"{0}\" entfernen für {1} \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "{0}={1} setzen für {2} \"{3}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2310,19 +2330,26 @@
 msgstr[1] "Objekte"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "\"{0}\" entfernen für {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "{0}={1} setzen für {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
 msgstr "ÄndereRelationsElementRolle"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2330,25 +2357,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr "Kann unentschiedenen Konflikt nicht auflösen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "{1} {0} löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "{0} {1} löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Konflikt mit Relation"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2359,11 +2386,11 @@
 "Aus Relation entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2374,10 +2401,10 @@
 "Aus Relation entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Wegabschnitt aufspalten"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2389,20 +2416,20 @@
 "diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "Konflikte im Löschstatus für {0} auflösen"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Verschieben"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2418,5 +2445,5 @@
 #, java-format
 msgid "removing reference from way {0}"
-msgstr ""
+msgstr "Entferne Referenz aus Weg {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
@@ -2430,9 +2457,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid "removing reference from relation {0}"
-msgstr "Elemente aus Relationen entfernt"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+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}"
@@ -2440,34 +2467,41 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+#, fuzzy, java-format
+msgid "RemoveRelationMember {0} {1}"
 msgstr "EntferneRelationsElement"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Drehen"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "{0} {1} löschen"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Abfolge"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../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:41
+#: ../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:52
+#: ../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
+#, fuzzy
+msgid "Main.ds doesn't include node {0}"
+msgstr "Lokale Daten beinhalten keine Merkmale mit dem Schlüssel {0}."
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2564,25 +2598,51 @@
 msgstr "Kann keine Einstellungen vom Server laden."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "Parameter \"{0}\" darf nicht NULL sein"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "Dezimalgrad"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "W"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "O"
@@ -2593,5 +2653,5 @@
 msgstr "Der Parameter \"{0}\" muss größer als 0 sein. Er ist aber \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2616,5 +2676,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2717,18 +2777,13 @@
 msgstr "Keine \"neueste\" Version gefunden. Es gibt gar keine Geschichte."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr "Konnte kein Objekt mit ID {0} im Datensatz finden"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr "Konnte kein Objekt mit ID {0} und Version {1} im Datensatz finden"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-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."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2736,16 +2791,5 @@
 msgstr "Parameter ''{0}'' größer als 0 erwartet. Der Wert ist ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr "Parameter \"{0}\" darf nicht NULL sein"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2759,127 +2803,127 @@
 msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Flächenförmiger Weg ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygon-Weg ''{0}''  ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Gelöschtes Element ''{0}'' in der Relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg ''{0}'' mit weniger als zwei Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 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:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 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:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Mehr als ein Element mit \"via\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unbekannte Role \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unbekannter Elementtyp für \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Kein \"from\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Kein \"to\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "Kein \"via\"-Knoten oder Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Nicht-Weg ''{0}'' im Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Kein äußerer Weg im Multipolygon ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Innerer Weg \"{0}\" ist außerhalb."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "Ohne Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "Text"
@@ -2887,5 +2931,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2894,4 +2938,6 @@
 "Keeping my primitive. "
 msgstr ""
+"Mein Element mit der Nr. {0} in der Version {1} ist sichtbar, obwohl es in "
+"der niedrigeren Version {2} gelöscht ist. Es wird daher weiterhin behalten. "
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -2913,6 +2959,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "Hintergrund"
@@ -2922,24 +2968,9 @@
 msgstr "Hervorgehoben"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2955,36 +2986,24 @@
 "die Daten und starten Sie eine neue Ebene mit der neuen Zone."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambert-Zone (Frankreich)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-Zone (Estland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Merkator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swissgrid (Schweiz)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "{0} verschieben"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2996,14 +3015,14 @@
 msgstr "Lesezeichen konnten nicht geschrieben werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Nachricht des Tages nicht verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- aktive Version ist {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Nachricht des Tages herunterladen"
@@ -3055,5 +3074,5 @@
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
-"Herunterladen als Roh-GPS-Daten. Das kann x1,y1,x2,y2, eine URL mit "
+"Herunterladen als GPS-Rohdaten. Das kann x1,y1,x2,y2, eine URL mit "
 "lat=y&llon=x&zoom=z oder ein Dateiname sein."
 
@@ -3201,5 +3220,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3261,5 +3279,5 @@
 msgstr "Herauszoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "Skala"
@@ -3293,8 +3311,13 @@
 msgstr "(kein Objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "Ebene nicht in der Liste."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3302,9 +3325,9 @@
 msgstr "OSM-Server kontaktieren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Fehler beim Einlesen"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Datei nicht gefunden"
@@ -3366,4 +3389,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3373,4 +3397,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "Knoten"
@@ -3378,5 +3404,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Mitglieder"
@@ -3591,7 +3618,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3673,4 +3700,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3678,4 +3708,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3687,4 +3718,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3708,14 +3740,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Bei der Verbindung zum Server \"{0}\" ist ein Fehler aufgetreten."
+msgstr ""
+"<html>Fehler bei der Kommunikation mit dem Server<br>Details: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Fehler bei der Kommunikation mit dem Server."
+msgstr "Fehler bei der Kommunikation mit dem Server"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3783,5 +3815,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
-#, fuzzy
 msgid "Visible State:"
 msgstr "Löschstatus:"
@@ -3804,22 +3835,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
-#, fuzzy
 msgid "visible (on the server)"
-msgstr "Objekt auf Server gelöscht"
+msgstr "Sichtbar (auf Server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
-#, fuzzy
 msgid "not visible (on the server)"
-msgstr "Objekt auf Server gelöscht"
+msgstr "gelöscht (auf dem Server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Bitte geben Sie einen Namen für den Ort an."
+msgstr "Exakte Kopie der lokalen Version behalten"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
-#, fuzzy
 msgid "Physically delete from local dataset"
-msgstr "Meine Version (lokale Daten)"
+msgstr "Aus dem lokalen Datensatz löschen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
@@ -3848,18 +3875,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
-#, fuzzy
 msgid "Keep my visible state"
-msgstr "Behalte den Löchstatus der  lokalen Daten."
+msgstr "Übernehme meinen Löschstatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Ja, auch wiederherstellen"
+msgstr "Ja, diese ID zurücksetzten"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Kein Datum"
+msgstr "Nein, abbrechen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3870,17 +3894,19 @@
 "agree?</html>"
 msgstr ""
+"<html>Um die lokale Version zu erhalten muss JOSM die ID von {0} {1} auf "
+"Null zurücksetzen.<br>Beim nächsten mal Hochladen wird der Server dann eine "
+"neue ID zuteilen.<br>Sind Sie hiermit einverstanden?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "ID auf 0 zurücksetzen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
-#, fuzzy
 msgid "Keep their visible state"
-msgstr "Behalte den Löchstatus der Server-Daten."
+msgstr "Übernehme deren Löschstatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
-msgstr ""
+msgstr "Ja, Entfernen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
@@ -3890,23 +3916,25 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
+"<html>JOSM wird das Element {0} im lokalen Datensatz löschen. <br> Sind sie "
+"damit einverstanden?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "aus der Auswahl entfernen"
+msgstr "Aus dem Datensatz löschen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
-#, fuzzy
 msgid "Undecide conflict between visible state"
-msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus."
+msgstr "Löschstatus ist unterschiedlich."
 
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rolle"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Objekt"
@@ -3926,4 +3954,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<undefiniert>"
@@ -3947,8 +3977,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3959,7 +3989,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -4015,5 +4046,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Befehlsliste"
@@ -4024,6 +4055,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -4034,5 +4065,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -4041,10 +4072,27 @@
 msgstr "Umschalten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Befehlsliste: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Konflikte auflösen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Auflösen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -4054,26 +4102,4 @@
 "Ausgewählte Elemente auf der Karte auf die obige Liste der ausgewählten "
 "Objekte setzen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Auflösen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Konflikte auflösen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konflikte: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -4114,45 +4140,50 @@
 "Dialog zurückzukehren.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Klicken Sie \"Neu Laden\", um die Liste zu aktualisieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Verlauf"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Versionen aller gewählten Objekte anzeigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Datum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+"<html>Das Laden der Historie vom Server ist fehlgeschlagen. Details:<br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "Tabellenindex außerhalb der Grenzen ({0})"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr "History-Eintrag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "History laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr "Lade Historie für {0} mit ID {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Alle ausgewählten Objekte neu laden und die Liste aktualisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Rückgängig"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-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."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Noch nicht implementiert."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Anzeigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr "History der markierten Elemente anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4285,4 +4316,18 @@
 msgid "Add Properties"
 msgstr "Eigenschaften hinzufügen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Hinzufügen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4395,9 +4440,9 @@
 msgstr "Auswahl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Ansicht separat darstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4406,5 +4451,5 @@
 "Werkzeugleiste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht"
@@ -4436,179 +4481,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Änderungen übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Belegt durch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "verbunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Merkmale (leerer Wert löscht das Merkmal)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Nach oben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Ausgewählte Elemente nach oben schieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Ausgewähltes hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Alle ausgewählten Objekte als Elemente hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Ausgewähltes entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Alle ausgewählten Objekte aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Ausgewählte Quelle aus der Liste entfernen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Nach unten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Ausgewählte Elemente nach unten schieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Elemente in der gewählten Tabellenzeile aus dieser Relation entfernen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen."
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "nein"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Mitglieder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relationseditor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Es sind Konflikte beim Importieren aufgetreten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Fehler beim Parsen der Serverantwort."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Kann nicht mit Server verbinden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr "Fehler bei der Kommunikation mit dem Server."
@@ -4643,21 +4611,21 @@
 msgstr "Bitte wählen Sie erst ein Lesezeichen."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min Breite"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max Breite"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4667,5 +4635,5 @@
 "zu laden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Koordinaten"
@@ -4814,692 +4782,49 @@
 msgstr "Kachelnummern"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Bilder für {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "GPX lesen..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Keine Zeit für Punkt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Einlesen {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Georeferenzierte Bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS Start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS Ende: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "Aktueller Unterschied: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "Zeitzonen Unterschied: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "Bild"
-msgstr[1] "Bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} innerhalb der GPS-Spur."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Uhrzeit synchronisieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-Bilder (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Bild"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Zeit mit GPS-Gerät synchronisieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Die eingegebene Zeit konnte nicht eingelesen werden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "GPS-Punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Linienaussehen anpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Globale Einstellungen verwenden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Linienaussehen wählen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Farben anpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Voreinstellung"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Farbe auswählen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Marken von benannten Punkten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Benannte GPS-Punkte von {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Audio importieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Audio-Dateien im Wave-Format (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio-Marken von {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Bilder importieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} GPS-Spur, "
-msgstr[1] "{0} GPS-Spuren, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} Route, "
-msgstr[1] "{0} Routen, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} Wegpunkt"
-msgstr[1] "{0} Wegpunkte"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Name: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Beschreibung: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Zeitspanne: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Länge: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Zur Daten-Ebene konvertieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist unerwünscht!"
-"<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Konvertiert von: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Alles im Bereich herunterladen:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} Meter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Maximalgebiet je Anfrage:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Diese Aktion benötigt {0} individuelle Serveranfragen.<br>Wollen Sie "
-"fortfahren?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Keine GPS-Spur in der Ebene verfügbar, die mit den Audiodaten verbunden "
-"werden kann."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Einige Wegpunkte mit Zeitstempeln vor Beginn oder nach dem Ende der GPS-Spur "
-"wurden ignoriert oder an den Anfang verschoben."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Einige Wegpunkte, welche für eine vernünftige Zeitabschätzung zu weit von "
-"der GPS-Spur entfernt waren, wurden ignoriert."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "Außerhalb des heruntergeladenen Bereichs"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "Version {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-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"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "Es traten {0} Konflikte während des Imports auf."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} besteht aus:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} gelöscht.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "nicht angegeben"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "API-Version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Zu GPX-Ebene konvertieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "GPS-Spur"
-msgstr[1] "GPS-Spuren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "Punkt"
-msgstr[1] "Punkte"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "Eine GPS-Spur mit einem Punkt"
-msgstr[1] "Eine GPS-Spur mit {0} Punkten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} besteht aus {1} GPS-Spur"
-msgstr[1] "{0} besteht aus {1} GPS-Spuren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} Punkt"
-msgstr[1] "{0} Punkte"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "GPS-Wegpunkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "Wegpunkt"
-msgstr[1] "Wegpunkte"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} besteht aus {1} Wegpunkt"
-msgstr[1] "{0} besteht aus {1} Wegpunkten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Ton synchronisieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Ton synchronisiert bei Punkt {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-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:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"Sie müssen die Tonwiedergabe an der Stelle der GPS-Spur pausieren, an der "
-"die Marke eingefügt werden soll."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Keine bestehenden Audio-Marken in dieser Ebene gefunden, von denen der "
-"Offset abgeleitet werden könnte."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"Die Abspielposition muss in die Nähe der GPS-Spur bewegt werden, deren "
-"Aufnahme abgespielt werden soll (nach der ersten Marke)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Die Abspielposition muss mit gedrückter SHIFT-Taste auf die zu "
-"sychronisierende Audio-Marke oder den Wegpunkt bewegt werden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Konnte Audio-Marke nicht synchronisieren."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Fehler beim Anzeigen der URL für diesen Wegpunkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(Die URL lautet: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Fehler beim Anzeigen der URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Erweiterte Einstellungen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Einstellungseinträge direkt setzen. Bitte vorsichtig benutzen!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Suche: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Aktueller Wert ist Standard."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Standardwert ist ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Neuer Wert für {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Bitte wählen Sie die zu löschende Zeile."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Ein neues Schlüssel/Wert-Paar hinzufügen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Audio-Menü anzeigen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Audio-Marken (und Bild- und Web-Marken) benennen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Live-Tonspur anzeigen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Explizite Wegpunkte mit gültigen Zeitstempeln."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Explizite Wegpunkte mit Zeitschätzung aus GPS-Position."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Benannte GPS-Punkte"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Modifizierte Zeiten (Zeitstempel) der Audiodateien."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-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)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Den Audio-Eintrag im Hauptmenü anzeigen oder verbergen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Ein sich bewegendes Symbol verwenden, um anzuzeigen, an welcher Stelle der "
-"synchronisierten GPS-Spur der aktuell abgespielte Ton aufgenommen wurde."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"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."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Markenebene automatisch aus Wegpunkten erzeugen, wenn eine GPX-Ebene "
-"geöffnet wird."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Beim Importieren von Audio, Marken erzeugen aus..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Importiertes Audio an allen Wegpunkten in der GPX-Ebene anbringen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Automatisch Audio-Marken aus GPS-Punkten mit Namen oder Beschreibungen "
-"erzeugen (anstatt explizit aus Wegpunkten)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Audio-Marken an der zur modifizierten Zeit jeder importierten Audiodatei "
-"gehörenden Position der GPS-Spur erstellen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Die Anzahl Sekunden, um die bei entsprechendem Tastendruck vorwärts oder "
-"zurück gesprungen werden soll"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Schrittweite vorwärts/zurück (s)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-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"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Beschleunigungsfaktor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Die Wiedergabe startet so viele Sekunden vor der angegebenen Position "
-"(negative Werte für später)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Ton-Vorlauf (s)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-"Das Verhältnis zwischen der Laufzeit der Sprachaufzeichnung und der wirklich "
-"vergangenen Zeit"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Kalibrierung der Tonaufzeichnung"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Farbe"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "Historie für {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "Dialog schließen"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+"Die Geschichte ist noch nicht initialisiert. Fehler beim Erstellen des "
+"Referenzelements."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+"Fehler beim Setzen der Referenz. Referenz-ID {0} stimmt nicht mit der ID "
+"'{1}' der Geschichte überein"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+"Fehler beim Erstellen des Referenzelements. Version {0} der Referenz ist in "
+"der Geschichte nicht vorhanden."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+"Die Geschichte ist noch nicht initialisiert. Fehler beim Erstellen des "
+"aktuellen Elements."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr "Aktuelle Version {0} nicht in der Versionsgeschichte vorhanden!"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Knoten {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6209,5 +5534,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6358,40 +5684,755 @@
 msgstr "Name"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Version <strong>{0}</strong> erzeugt am <strong>{1}</strong> von "
+"<strong>{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Version {0} erzeugt am {1} von {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Version"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Bilder für {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "GPX lesen..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Keine Zeit für Punkt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Einlesen {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Georeferenzierte Bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS Start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS Ende: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "Aktueller Unterschied: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "Zeitzonen Unterschied: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "Bild"
+msgstr[1] "Bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} innerhalb der GPS-Spur."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Uhrzeit synchronisieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-Bilder (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Bild"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Zeit mit GPS-Gerät synchronisieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Die eingegebene Zeit konnte nicht eingelesen werden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "GPS-Punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Linienaussehen anpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Globale Einstellungen verwenden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Linienaussehen wählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Farben anpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Voreinstellung"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Farbe auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Marken von benannten Punkten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Benannte GPS-Punkte von {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Audio importieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Audio-Dateien im Wave-Format (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio-Marken von {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Bilder importieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} GPS-Spur, "
+msgstr[1] "{0} GPS-Spuren, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} Route, "
+msgstr[1] "{0} Routen, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} Wegpunkt"
+msgstr[1] "{0} Wegpunkte"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Name: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Beschreibung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Zeitspanne: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Länge: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Zur Daten-Ebene konvertieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist unerwünscht!"
+"<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Konvertiert von: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Alles im Bereich herunterladen:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} Meter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Maximalgebiet je Anfrage:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Diese Aktion benötigt {0} individuelle Serveranfragen.<br>Wollen Sie "
+"fortfahren?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+"Keine GPS-Spur in der Ebene verfügbar, die mit den Audiodaten verbunden "
+"werden kann."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Einige Wegpunkte mit Zeitstempeln vor Beginn oder nach dem Ende der GPS-Spur "
+"wurden ignoriert oder an den Anfang verschoben."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Einige Wegpunkte, welche für eine vernünftige Zeitabschätzung zu weit von "
+"der GPS-Spur entfernt waren, wurden ignoriert."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datenebene {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "Außerhalb des heruntergeladenen Bereichs"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+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"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Es traten {0} Konflikte während des Imports auf."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} besteht aus:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} gelöscht.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "nicht angegeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "API-Version: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Zu GPX-Ebene konvertieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "GPS-Spur"
+msgstr[1] "GPS-Spuren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "Punkt"
+msgstr[1] "Punkte"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "Eine GPS-Spur mit einem Punkt"
+msgstr[1] "Eine GPS-Spur mit {0} Punkten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} besteht aus {1} GPS-Spur"
+msgstr[1] "{0} besteht aus {1} GPS-Spuren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} Punkt"
+msgstr[1] "{0} Punkte"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "GPS-Wegpunkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "Wegpunkt"
+msgstr[1] "Wegpunkte"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} besteht aus {1} Wegpunkt"
+msgstr[1] "{0} besteht aus {1} Wegpunkten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Ton synchronisieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Ton synchronisiert bei Punkt {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+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:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Sie müssen die Tonwiedergabe an der Stelle der GPS-Spur pausieren, an der "
+"die Marke eingefügt werden soll."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Keine bestehenden Audio-Marken in dieser Ebene gefunden, von denen der "
+"Offset abgeleitet werden könnte."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Die Abspielposition muss in die Nähe der GPS-Spur bewegt werden, deren "
+"Aufnahme abgespielt werden soll (nach der ersten Marke)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Die Abspielposition muss mit gedrückter SHIFT-Taste auf die zu "
+"sychronisierende Audio-Marke oder den Wegpunkt bewegt werden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Konnte Audio-Marke nicht synchronisieren."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Fehler beim Anzeigen der URL für diesen Wegpunkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(Die URL lautet: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Fehler beim Anzeigen der URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Erweiterte Einstellungen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Einstellungseinträge direkt setzen. Bitte vorsichtig benutzen!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Suche: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Aktueller Wert ist Standard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Standardwert ist ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Neuer Wert für {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Bitte wählen Sie die zu löschende Zeile."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Ein neues Schlüssel/Wert-Paar hinzufügen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Audio-Menü anzeigen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Audio-Marken (und Bild- und Web-Marken) benennen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Live-Tonspur anzeigen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Explizite Wegpunkte mit gültigen Zeitstempeln."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Explizite Wegpunkte mit Zeitschätzung aus GPS-Position."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Benannte GPS-Punkte"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Modifizierte Zeiten (Zeitstempel) der Audiodateien."
+
+#: ../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)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Den Audio-Eintrag im Hauptmenü anzeigen oder verbergen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Ein sich bewegendes Symbol verwenden, um anzuzeigen, an welcher Stelle der "
+"synchronisierten GPS-Spur der aktuell abgespielte Ton aufgenommen wurde."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"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."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Markenebene automatisch aus Wegpunkten erzeugen, wenn eine GPX-Ebene "
+"geöffnet wird."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Beim Importieren von Audio, Marken erzeugen aus..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "Importiertes Audio an allen Wegpunkten in der GPX-Ebene anbringen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Automatisch Audio-Marken aus GPS-Punkten mit Namen oder Beschreibungen "
+"erzeugen (anstatt explizit aus Wegpunkten)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Audio-Marken an der zur modifizierten Zeit jeder importierten Audiodatei "
+"gehörenden Position der GPS-Spur erstellen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Die Anzahl Sekunden, um die bei entsprechendem Tastendruck vorwärts oder "
+"zurück gesprungen werden soll"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Schrittweite vorwärts/zurück (s)"
+
+#: ../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"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Beschleunigungsfaktor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Die Wiedergabe startet so viele Sekunden vor der angegebenen Position "
+"(negative Werte für später)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Ton-Vorlauf (s)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+"Das Verhältnis zwischen der Laufzeit der Sprachaufzeichnung und der wirklich "
+"vergangenen Zeit"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Kalibrierung der Tonaufzeichnung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Farbe"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Zeichenstil {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Ebene: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Wählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Eine Farbe für {0} auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Voreinstellung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Voreinstellung für alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Farben, die von verschiedenen Objekten in JOSM verwendet werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Farben"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6400,29 +6441,29 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Lokale Dateien"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Keine"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Linien erzwingen, wenn keine Abschnitte importiert wurden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Große GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Geschwindigkeit (rot = langsam, grün = schnell)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Positionsverschlechterung (rot = hoch, grün = langsam, wenn verfügbar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Einzelne Farbe (kann für benannte Ebenen angepasst werden)"
@@ -6430,5 +6471,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6449,5 +6490,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6485,5 +6526,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6496,50 +6537,50 @@
 msgstr "Zu Fuß"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Richtungspfeile zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Schnelles Zeichnen (schlechtere Qualität)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Nur am Ende des Weges"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Ordnungsnummer des Abschnitts anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Zeichne Grenzen der geladenen Daten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuelle Knoten im Auswahlmodus zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Inaktive Ebenen in anderer Farbe zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glätten der Kartengrafik (Anti-Aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
-msgstr "Zeichne Linien zwischen rohen GPS-Punkten."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+msgstr "Zeichne Linien zwischen GPS-Rohdatenpunkten"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6549,9 +6590,9 @@
 "\"-1\", um alle Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Maximallänge für lokale Dateien (Meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6560,10 +6601,10 @@
 "Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maximallänge (Meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6572,10 +6613,10 @@
 "Informationen enthalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtungspfeile an Linien zwischen GPS-Punkten zeichnen."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6584,5 +6625,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6591,13 +6632,13 @@
 "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Mindestabstand (Pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Größere Punkte für GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6607,9 +6648,9 @@
 "Ebenenübersicht angepasst werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Punkte und GPS-Spuren nach Geschwindigkeit einfärben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6619,5 +6660,5 @@
 "GPS-Empfänger muss diese Information aufzeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -6625,23 +6666,23 @@
 "Durchschnittsgeschwindigkeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Färbung von GPS-Spuren und Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS-Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Richtungspfeile für Wegabschnitte zeichnen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Ordnungsnummer für alle Abschnitte innerhalb des Weges anzeigen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -6650,10 +6691,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6662,99 +6703,120 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM-Daten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Sicherungsdateien erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Beim Speichern eine Sicherheitskopie endend auf ~ erstellen"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Startbild anzeigen"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Objektnummer in Auswahllisten anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Gummibandhilfslinie zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Modusloses Zeichnen (potlatchartig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Ohne Moduswechsel zeichnen (Arbeitsweise ähnlich zu Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Verhalten und Aussehen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Standard (Automatisch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Sprache"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Voreinstellungen laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Voreinstellungen laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Pistentyp"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Verfügbare Plugins bearbeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Liste laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Seiten konfigurieren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr "JOSM-Pluginbeschreibungsdatei hinzufügen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Bitte einen Eintrag wählen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr "JOSM-Pluginbeschreibungsdatei ändern."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Pluginquellen bearbeiten"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6762,81 +6824,81 @@
 msgstr "Verschiedene Optionen, die das Aussehen des Programms festlegen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Verbindungseinstellungen zum OSM-Server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Karten-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Audio-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Einstellungen für den Audio-Player und Audio-Marken."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Koordinaten anzeigen als"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Projektionsmethode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Projektionsmethode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Projektionsmethode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Koordinaten anzeigen als"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Proxy-Server verwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Proxyserver-Hostname"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Proxyserver-Port"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Proxyserver-Nutzername"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Proxyserver-Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Die Basis-URL des OSM Servers (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Benutzername (E-Mail) für den OSM-Server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6845,17 +6907,17 @@
 "soll."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Server Basis-URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr "OSM-Benutzername (E-Mail)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM-Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6873,77 +6935,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Tastaturkürzel-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Tastaturkürzel manuell anpassen."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Aktion"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Tastaturkürzel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Beschreibung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Ebene: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Autoren: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Hilfe: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Standard kopieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Bitte wählen Sie eine Zeile zum Kopieren."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Eine neue Quelle zur Liste hinzufügen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Ausgewählte Quelle aus der Liste entfernen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Objektvorlagenmenü sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Voreinstellungen laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Quelle für Objektvorlagen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-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"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Eine neue Quelle für Objektvorlagen zur Liste hinzufügen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Ausgewählte Quelle aus der Liste entfernen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Objektvorlagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Quellen für Objektvorlagen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Trenner"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Werkzeugleiste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Werkzeugleistenanpassung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Die Elemente auf der Werkzeugleiste anpassen."
@@ -7216,6 +7309,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7224,7 +7317,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Datei {0} existiert bereits. Überschreiben?"
+msgstr "Die Datei \"{0}\" existiert nicht"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7232,5 +7325,5 @@
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Fehler beim Einlesen von Datei \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
@@ -7242,9 +7335,11 @@
 msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
 msgstr ""
+"Im lokalem Datensatz ist kein Element mit der Nummer {0} vorhanden. Typ ist "
+"daher unklar."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
+msgstr "ID \"{0}\" ausgelassen wegen Serverantwort Nummer 404"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
@@ -7252,5 +7347,5 @@
 "Server replied with response code 404, retrying with an individual request "
 "for each primitive"
-msgstr ""
+msgstr "Serverantwort Nummer 404, versuche Einzelanfragen für jedes Element"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -7558,8 +7653,8 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 "WARNUNG: Einstellung \"{0}\" oder API-Version \"{1}\" erfordern die Nutzung "
@@ -7572,15 +7667,15 @@
 msgstr "{0}% ({1}/{2}), {3} verbleiben. Überspiele {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Plugins aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Plugins herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7593,5 +7688,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7600,23 +7695,23 @@
 msgstr[1] "{0} Plugins erfolgreich heruntergeladen. JOSM bitte neustarten."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Plugin {0} herunterladen..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
 msgid "Skip download"
 msgstr "Herunterladen überspringen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "Für Plugin {1} wird  JOSM-Version {0} benötigt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Download Plugin"
 msgstr "Plugin herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr "Herunterladen überspringen"
@@ -7666,6 +7761,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Plugin abschalten"
@@ -7681,5 +7776,5 @@
 msgstr "Plugin behalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7689,5 +7784,5 @@
 "die Rechte besitzt die vorhandenen Plugins zu überschreiben."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7697,10 +7792,10 @@
 "ausgelöst haben könnte."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Laut den Informationen des Plugins ist der Autor des Plugins {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7709,9 +7804,9 @@
 "Plugins, bevor Sie den Fehler melden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Soll das Plugin abgeschaltet werden?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7721,5 +7816,5 @@
 "um das Plugin zu entfernen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7729,19 +7824,19 @@
 "Verwaltern Ihres JOSM-Pakets."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "keine Beschreibung verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "Mehr Details"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7750,13 +7845,13 @@
 msgstr[1] "Plugin-Informationen von {0} Quellen geladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Keine Plugin-Informationen gefunden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Alle installierten Plugins sind aktuell."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7769,9 +7864,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Fehlende Plugins herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7784,6 +7879,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7806,14 +7901,14 @@
 msgstr "unbekannt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin mit JOSM ausgeliefert"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -8076,45 +8171,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-Positionen aus EXIF-Daten extrahieren"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Verzeichnisuntersuchen starten"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Eine der ausgewählten Datei war leer!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Photos lesen..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Verzeichnis {0} untersuchen"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leere Datei im Verzeichnis {0} gefunden\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Mit GPX korrelieren"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8326,20 +8421,20 @@
 msgstr "Sekunden: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "{0} von {1} Bildern mit GPS-Spur synchronisiert."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Zeitdifferenz von {0} Tagen)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Offset zwischen GPS-Spur und Bildern: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8350,13 +8445,13 @@
 "synchonisieren."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Zeitzone und Offset anpassen"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Standardwerte"
@@ -8378,5 +8473,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Fehler beim Laden der Datei"
@@ -8740,5 +8835,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Leere Ebene"
@@ -8846,20 +8941,22 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS-Dateien (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr "Formatfehler: "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "TangoGPS erfolgreich importiert"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "Fehler beim TangoGPS-Import!"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Dateiformatfehler"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA-Einlesen erfolgreich"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "NMEA-Einlesen fehlgeschlagen!"
+msgid "TCX Files (*.tcx)"
+msgstr "TangoGPS-Dateien (*.log)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8884,5 +8981,5 @@
 msgstr "Weg duplizieren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Ebene zum Änderung von GPS-Spuren"
@@ -8903,11 +9000,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Weg aus GPX-Ebene importieren"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Existierenden Weg verwerfen"
@@ -8916,6 +9013,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Keine GPX-Datenebene gefunden."
@@ -8978,6 +9075,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Aktualisieren"
@@ -9286,7 +9383,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "Wasser"
@@ -9604,8 +9701,11 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>Das openstreetbugs-Plugin verwendet den alten Server auf appspot.com."
+"<br>Ein neuer Server ist unter schokokeks.org verfügbar.<br>Möchtest du zum "
+"neuen Server wechseln? (dringend empfohlen)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Zum neuen openstreetbugs-Server wechseln?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -9635,10 +9735,10 @@
 "umgewandelt werden"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugs öffnen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
@@ -9646,5 +9746,5 @@
 "Herunterladen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9779,19 +9879,19 @@
 msgstr "Erlaubte Aktionen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Details der Anfrage: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Soll dies erlaubt werden?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9908,5 +10008,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Flush Tile Cache"
-msgstr ""
+msgstr "Kachel-Zwischenspeicher leeren"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
@@ -9915,7 +10015,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Daten hochladen..."
+msgstr "Lade Bild..."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -10108,13 +10207,4 @@
 msgstr ""
 "Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "TCX-Datei importieren..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "TCX-Datei als GPS-Spur importieren"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10331,33 +10421,33 @@
 msgstr "Einen Dialog zum Springen an eine spezifische Position öffnen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Länge und Breite der Sprungposition angeben."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Sie können auch eine URL von www.openstreetmap.org einfügen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoom (in Meter)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Dorthin springen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Zu Position springen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr "Länge, Breite oderZoom konnten nicht gelesen werden. Bitte prüfen."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Länge oder Breite nicht lesbar"
@@ -10680,23 +10770,23 @@
 "könnte."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Eigenschaftsprüfer:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Dieses Plugin prüft auf Fehler in Schlüsseln und Werten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ungültige Zeile im Merkmalsprüfer - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ungültige Zeile im Rechtschreibprüfer: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10707,5 +10797,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Ungültige Schlüssel/Wert-Kombinationen"
@@ -10713,78 +10803,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Zeichenproblem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Schlüssel \"{0}\" ungültig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Merkmale mit leerem Wert"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Ungültiger Schlüssel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Ungültiger Leerraum in Schlüssel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Werte beginnen oder enden mit Leerraum"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Werte enthalten HTML-Entität"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Schlüssel \"{0}\" nicht in Vorlagen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Vorlagen enthalten Schlüssel nicht"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Wert \"{0}\" für Schlüssel \"{1}\" nicht in Vorlagen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Vorlagen enthalten Wert nicht"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "Korrekturnotizen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Schlüssel prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Schlüssel durch Abgleich mit einer Liste auf Gültigkeit prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Komplexen Eigenschaftsprüfer verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr "Gültigkeit von Werten und Schlüsseln anhand komplexer Regeln prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Datenquelle für Merkmalsprüfer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10794,29 +10884,29 @@
 "wiki.openstreetmap.org/index.php/User:JLS/speller) oder Merkmalsprüfung."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Eine neue Quelle zur Liste hinzufügen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Ausgewählte Quelle bearbeiten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Datenquellen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Werte überprüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr "Prüft die Gültigkeit von Werten anhand von Objektvorlagen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Auf Korrekturnotizen prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -10824,46 +10914,56 @@
 "(fixme) stehen haben."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Zeichennotizen prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Standarddatendatei verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Nutzung der Standarddatendatei (empfohlen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Standarddatendatei verwenden."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Nutzung der Standarddatendatei (empfohlen)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Standarddatei für Schreibprüfung verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Standarddatei für die Schreibfehlerprüfung verwenden (empfohlen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Eigenschaften korrigieren"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Konnte Elementtyp nicht finden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Konnte Warnlevel nicht finden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ungültiger Ausdruck \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -11008,7 +11108,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "Gebäude"
@@ -11022,5 +11122,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "Fläche"
@@ -11030,9 +11130,9 @@
 msgstr "Nicht geschlossener Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Unverbundene Wege."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -11040,17 +11140,17 @@
 "hat."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Wegende nahe anderer Straße"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Wegende nahe anderem Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Wegpunkt nahe anderem Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Verbundenes Wegende nahe anderem Weg"
@@ -11077,17 +11177,22 @@
 "Wege ohne Merkmale."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Unbenannte Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Kreuzung bearbeiten"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Wege ohne Merkmale"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Leere Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Wege, die nur aus einem Knoten bestehen"
@@ -11125,14 +11230,14 @@
 msgstr "Startknoten an einem Wegende auswählen"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr "Ende des Pfades erreicht"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr "Kreuzung erreicht"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Fehler"
@@ -11255,5 +11360,5 @@
 msgstr "Die Position der gewählten WMS-Ebene anpassen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11268,15 +11373,15 @@
 msgstr "Automatisches Laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11285,102 +11390,91 @@
 "die Auflösung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Sichtbare Kacheln laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
-msgstr "Fehlerkacheln neu laden"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+msgstr "Fehlerhafte Kacheln neu laden"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Einstellungen für WMS-Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Liste der WMS-Server ändern, die im WMS Plugin-Menü angezeigt werden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Menüname"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Menüname (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Standard kopieren"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Bitte wählen Sie eine Zeile zum Kopieren."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr "Kacheln überlappen"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% der Breite:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% der Länge:"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Daten herunterladen"
 
 #. *
@@ -11474,5 +11568,5 @@
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Ermöglicht den direkten Import verschiedener Dateiformate in JOSM."
 
 #. Plugin DirectUpload
@@ -11635,16 +11729,11 @@
 "Jar-Datei auch einzeln starten."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "TCX-Dateien direkt aus JOSM heraus laden."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11656,5 +11745,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11665,5 +11754,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11675,10 +11764,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:67
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:69
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12477,4 +12566,64 @@
 msgstr "Zugang"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "ja"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12498,5 +12647,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "Privat"
@@ -12544,5 +12693,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "Anlieger"
@@ -12579,5 +12728,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "privat gestattet"
@@ -12596,4 +12745,28 @@
 msgid "agricultural"
 msgstr "Agrar & Forst"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "nein"
 
 #: build/trans_presets.java:315
@@ -12809,6 +12982,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "Autobahn"
@@ -12834,6 +13007,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "Schnellstraße"
@@ -12859,6 +13032,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "Bundesstraße"
@@ -12884,6 +13057,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "Landesstraße"
@@ -12897,5 +13070,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "Kreisstraße"
@@ -12913,5 +13086,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "Ortsstraße"
@@ -12929,5 +13102,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "Service"
@@ -12954,6 +13144,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "Baustelle"
@@ -13003,5 +13193,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -13980,5 +14170,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "Marsch"
@@ -15709,27 +15899,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "Sport"
@@ -18567,8 +18757,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "Fahrrad"
@@ -18637,8 +18827,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "Fuß"
@@ -18664,5 +18854,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "U-Bahn"
@@ -18792,4 +18982,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18798,4 +18989,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18804,4 +18996,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18810,4 +19003,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18871,7 +19065,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "Brücke"
@@ -18929,4 +19123,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19052,7 +19247,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -19135,15 +19330,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "veraltet"
@@ -19185,5 +19380,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "Pferd"
@@ -19393,11 +19588,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "Barriere"
@@ -19435,6 +19630,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "Straße"
@@ -19490,7 +19685,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "Weg"
@@ -19546,8 +19741,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "Eisenbahn"
@@ -19568,5 +19763,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "Service"
@@ -19580,5 +19775,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr "Furt"
@@ -19599,5 +19794,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "Wendekreis"
@@ -19612,5 +19807,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr "Notfallrettungspunkt"
@@ -19625,5 +19820,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "Flussufer"
@@ -19637,5 +19832,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "Fluss"
@@ -19649,5 +19844,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "Dock"
@@ -19675,5 +19870,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "Aquädukt"
@@ -19841,13 +20036,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "Zivilisationsbauten"
@@ -19909,7 +20104,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "Eisenbahnpunkt"
@@ -19932,10 +20127,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "Andere Bahnen"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "Eisenbahn-Überlagerung"
@@ -19955,7 +20150,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19963,8 +20161,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "Alte Eisenbahn"
@@ -20009,6 +20211,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "Rollweg"
@@ -20022,5 +20224,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "Terminal"
@@ -20042,5 +20244,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "Rollweg (dunkel)"
@@ -20054,5 +20256,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "Rollweg (hell)"
@@ -20100,7 +20302,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "Luftweg"
@@ -20117,5 +20319,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "Einfache Piste"
@@ -20130,5 +20332,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "Mittelschwere Piste"
@@ -20143,5 +20345,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "Fortgeschrittenenpiste"
@@ -20156,5 +20358,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "Expertenpiste"
@@ -20169,5 +20371,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "freie Piste"
@@ -20182,5 +20384,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "Anfängerpiste"
@@ -20285,10 +20487,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "Strom"
@@ -20302,5 +20504,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "Anlegestelle (Pier)"
@@ -20314,5 +20516,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "Pipeline"
@@ -20440,12 +20642,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "Freizeit"
@@ -20459,5 +20661,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "Jachthafen"
@@ -20529,8 +20731,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "Einrichtungen"
@@ -20632,10 +20834,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "Verkehrseinrichtungen"
@@ -21021,22 +21223,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "Einrichtungen (hell)"
@@ -21068,6 +21270,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "Wasser (hell)"
@@ -21128,8 +21330,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "Gesundheit"
@@ -21482,26 +21684,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "Geschäft"
@@ -21573,8 +21775,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "Hotel"
@@ -21724,9 +21926,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "Tourismus"
@@ -21798,8 +22000,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "Historisch"
@@ -21870,8 +22072,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "Grün"
@@ -21885,5 +22087,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "Steinbruch"
@@ -21897,5 +22099,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -21917,5 +22119,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "Wasserbecken"
@@ -21929,5 +22131,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "Forst"
@@ -21941,5 +22143,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "Farmland"
@@ -21962,5 +22164,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "Einkaufsbereich"
@@ -21974,5 +22176,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -21986,5 +22188,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "Baulücke"
@@ -21998,5 +22200,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "Bauland"
@@ -22010,5 +22212,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -22065,7 +22267,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "Militär"
@@ -22079,5 +22281,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "Friedhof"
@@ -22090,5 +22292,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "Berggipfel"
@@ -22103,5 +22305,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "Gletscher"
@@ -22115,5 +22317,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "Vulkan"
@@ -22168,8 +22370,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "Natur"
@@ -22183,5 +22385,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "Buschland"
@@ -22195,5 +22397,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "Heide"
@@ -22207,5 +22409,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "Naturwald"
@@ -22219,5 +22421,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -22231,5 +22433,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "Strand"
@@ -22307,8 +22509,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "Route"
@@ -22356,7 +22558,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "Grenze"
@@ -22498,10 +22700,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "Ort"
@@ -22549,6 +22751,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "Adresse"
@@ -22779,10 +22981,10 @@
 msgstr "LandSat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "OpenAerial-Karte"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22790,5 +22992,5 @@
 msgstr "NPE-Karten"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22796,48 +22998,201 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "Yahoo (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap-Daten"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "Yahoo (GNOME/NetPBM)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Fahrradweg"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "Yahoo (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "Yahoo (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Straßen NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr "Terraserver Topo"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr "Terraserver Urban"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datenebene"
+
+#~ msgid "Change"
+#~ msgstr "Ändern"
+
+#~ msgid "Rotate"
+#~ msgstr "Drehen"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ 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 "Conflicts: {0}"
+#~ msgstr "Konflikte: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Quelle für Objektvorlagen"
+
+#~ 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 "Add a new tagging preset source to the list."
+#~ msgstr "Eine neue Quelle für Objektvorlagen zur Liste hinzufügen."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Quellen für Objektvorlagen"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "TCX-Datei importieren..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "TCX-Datei als GPS-Spur importieren"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Kacheln überlappen"
+
+#~ msgid "% of lat:"
+#~ msgstr "% der Breite:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% der Länge:"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "TCX-Dateien direkt aus JOSM heraus laden."
+
+#~ 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 "Not implemented yet."
+#~ msgstr "Noch nicht implementiert."
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Konflikte auflösen"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ 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 "position"
+#~ msgstr "Position"
+
+#~ msgid "different"
+#~ msgstr "unterschiedlich"
+
+#~ msgid "true"
+#~ msgstr "wahr"
+
+#~ msgid "false"
+#~ msgstr "falsch"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "{0} Konflikte in {1} Objekten auflösen"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Klicken Sie \"Neu Laden\", um die Liste zu aktualisieren"
+
+#~ msgid "Revert"
+#~ msgstr "Rückgängig"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ 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 "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 "Solve Conflict"
+#~ msgstr "Konflikte lösen"
 
 #~ msgid ""
@@ -22847,4 +23202,10 @@
 #~ "Bitte mindestens einen Knoten, Weg oder Relation wählen. Nur bereits "
 #~ "hochgeladene Elemente haben eine Geschichte."
+
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "Bild mit Pfad {0} existiert nicht oder ist nicht lesbar."
+
+#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
+#~ msgstr "unerwarteder Wert für die Eigenschaft conflict.resolution = "
 
 #~ msgid "Undeleting Way..."
@@ -22893,47 +23254,5 @@
 #~ msgstr "Auswahl zu groß"
 
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Bild mit Pfad {0} existiert nicht oder ist nicht lesbar."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Konflikte auflösen"
-
-#~ 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 "position"
-#~ msgstr "Position"
-
-#~ msgid "different"
-#~ msgstr "unterschiedlich"
-
-#~ msgid "true"
-#~ msgstr "wahr"
-
-#~ msgid "false"
-#~ msgstr "falsch"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "{0} Konflikte in {1} Objekten auflösen"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
 #~ msgstr ""
-#~ "Sie können die Maus oder Strg+Pfeiltasten benutzen um zu zoomen und zu "
-#~ "verschieben."
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Konflikte lösen"
-
-#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
-#~ msgstr "unerwarteder Wert für die Eigenschaft conflict.resolution = "
+#~ "Für das Objekt mit ID {0} wurde im Datensatz keine Geschichte gefunden."
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 16400)
+++ applications/editors/josm/i18n/po/el.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-19 21:09+0000\n"
-"Last-Translator: logictheo <towardsoss@gmail.com>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-05 14:53+0000\n"
+"Last-Translator: alichani <alichani@yahoo.co.uk>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:17+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,33 @@
 msgstr "Βοήθεια"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Η προβολή δεν μπόρεσε να διαβαστεί από τις προτιμήσεις. Χρήση Mercator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+"Βοήθεια: Μερικές αλλαγές προήλθαν από την αποστολή νέων δεδομένων στον "
+"διακομιστή."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Μη αποθηκευμένες αλλαγές"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Υπάρχουν μη αποθηκευμένες αλλαγές. Απόρριψη αλλαγών και συνέχεια;"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Αποθήκευση και Έξοδος"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Απόρριψη και Έξοδος"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +71,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +90,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +101,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "ΆΓΝΩΣΤΟ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Περί"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Εμφάνιση του παραθύρου περί"
@@ -131,10 +134,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,25 +145,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Έκδοση {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Τελεταία αλλαγή στις {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Έκδοση Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Ιστοσελίδα"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Αναφορές σφαλμάτων"
@@ -170,5 +174,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +180,27 @@
 msgstr "Πληροφορίες"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Διάβασέμε"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Αναθεώρηση"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Συνεισφορά"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Περί του JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Το αρχείο δεν βρέθηκε."
@@ -210,12 +214,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Προειδοποίηση"
@@ -270,5 +273,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Γεωγραφικό πλάτος"
@@ -277,5 +280,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Γεωγραφικό μήκος"
@@ -283,5 +286,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Τακτοποίηση Κόμβων σε Κύκλο"
@@ -294,5 +297,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -351,17 +354,19 @@
 "{0}, max is {1}"
 msgstr ""
+"Ο τρέχων αριθμός αλλαγών υπερβαίνει το μέγιστο αριθμό αλλαγών, τρέχων είναι "
+"{0}, μέγιστος είναι {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "Παραβίαση Δυνατοτήτων API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
 msgid "API initialization failed"
-msgstr ""
+msgstr "Αποτυχία αρχικοποίησης API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -380,7 +385,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Αντικρουόμενη σχέση"
+msgstr "Παραβίαση Προυποθέσεων"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -389,37 +393,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "δεδομένα"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "επίπεδο"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "σύγκρουση"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "λήψη"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Ζουμ στο {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Ζουμ στο {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -429,9 +433,9 @@
 msgstr "Προβολή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Δεν υπάρχει επιλογή στην οποία να γίνει ζουμ."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Καμοία διένεξη για να γίνει ζουμ"
@@ -519,38 +523,42 @@
 msgstr "Παρακαλώ επιλέξτε κάτι για αντιγραφή."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Δημιουργλια Κύκλου"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Δημιουργία κύκλου από τρείς επιλεγμένους κόμβους."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr ""
-"Παρακαλώ επιλέξτε ακριβώς 3 κόμβους ή ένας δρόμος με ακριβώς 3 κόμβους."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Αυτοι οι κόμβοι δεν βρίσκονται σε κύκλο."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr ""
+"Παρακαλώ επιλέξτε ακριβώς 3 κόμβους ή ένας δρόμος με ακριβώς 3 κόμβους."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -601,5 +609,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -672,5 +680,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
 msgid "E-Mail"
-msgstr ""
+msgstr "E-Mail"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -708,11 +716,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -723,5 +732,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Σφάλμα"
@@ -731,30 +740,30 @@
 msgstr "Επιλέξτε μια προκαθορισμένη άδεια"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "Online βοήθεια του JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Άνοιγμα σε Φυλλομετρητή"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -762,20 +771,20 @@
 msgstr "Επαναφόρτωση"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr ""
 "Η επεξεργασία σελίδων βοήθειας έιναι δυνατή μόνο από το JOSM Online Help"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -790,18 +799,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Εμφάνιση πληροφοριών ιστορικού για δρόμους ή κόμβους του OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Ιστορικό του Στοιχείου"
+msgstr "Πληροφορίες σχετικά με το Στοιχείο"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Εμφάνιση πληροφοριών ιστορικού για δρόμους ή κόμβους του OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -862,7 +868,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
-msgstr ""
+msgstr "Καθρεπτισμός"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
@@ -899,10 +905,10 @@
 msgstr "δεξιά"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Μετακίνηση {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -910,5 +916,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Δεν μπορείτε να μετακινήσετε αντικείμενα εκτός κόσμου."
@@ -1103,7 +1109,7 @@
 #, java-format
 msgid "File {0} exists. Overwrite?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+msgstr "Το αρχείο {0} υπάρχει. Επικάλυψη;"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1113,26 +1119,25 @@
 "αναφέρετε το σαν σφάλμα."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Δεν υπάρχει ανοιχτό έγγραφο και τίποτα προς αποθήκευση."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Κενό έγγραφο"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Το έγγραφο δεν περιέχει δεδομένα."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Επιβεβαίωση αποθήκευσης"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Συγκρούσεις"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1140,36 +1145,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Απόρριψη διενέξεων και Αποθήκευση"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Αποθήκευση αρχείου OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Αποθήκευση αρχείου GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+msgstr "Αποθήκευση Επιπέδου"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Αδυναμία δημιουργίας αντιγράφου ασφαλείας."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Άγνωστη επέκταση αρχείου."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Δημιοθργήθηκε σφάλμα κατά την επαναφορά αντιγράφου ασφαλείας."
@@ -1220,6 +1225,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Κλείσιμο"
@@ -1438,5 +1444,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
 msgid "Update failed"
-msgstr ""
+msgstr "Αποτυχία ενημέρωσης"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71
@@ -1452,5 +1458,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
 msgid "Update Selection"
-msgstr ""
+msgstr "Ενημέρωση Επιλογής"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
@@ -1464,70 +1470,70 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "Selection empty"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+msgstr "Κενή επιλογή"
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Αποστολή προς OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Αντικείμενα που θα προστεθούν:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Αντικείμενα που θα αλλαχτούν"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Αντικείμενα που θα διαγραφούν:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Να αποσταλούν αυτές οι αλλαγές;"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Αποστολή Αλλαγών"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Υπάρχουν ανεπίλυτες διενέξεις. Πρέπει να τις επιλύσετε πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+msgstr "Γίνεται αποστολή"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+msgstr "Συγχρονισμός μόνο {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1541,17 +1547,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1562,10 +1568,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+"Προειδοποίηση: η επικεφαλίδα σφάλματος \"{0}\" δεν συμπίπτει με τo "
+"αναμενόμενο πρότυπο \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1575,9 +1583,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1587,18 +1595,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+msgstr "Η αποστολή στο OSM API απέτυχε"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1703,25 +1711,16 @@
 msgstr "Ακατέργαστα δεδομένα GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Λήψη δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Δεν εισήχθησαν δεδομένα"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Επίπεδο Δεδομένων {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Δεδομένα OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Επίπεδο δεδομένων"
-
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
 #, java-format
@@ -1731,5 +1730,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
 msgid "The following errors occurred during mass download:"
-msgstr ""
+msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
@@ -1762,5 +1761,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1861,5 +1860,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -1874,5 +1873,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή"
@@ -1888,7 +1887,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1896,9 +1895,9 @@
 msgstr "Επιλέξτε"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Επιλέξτε, μετακινήστε και περιστρέψτε αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1907,5 +1906,28 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Μετακίνηση αριστερά"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Μετακίνηση αριστερά"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Αναίρεση"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1914,5 +1936,5 @@
 "συγχώνευση με το πλησιέστερο κόμβο."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1929,5 +1951,5 @@
 msgstr "Ζουμ και μετακίνηση χάρτη"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2008,5 +2030,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
+msgstr "<b>foot:</b> - κλειδί=foot ορισμένο με οποιαδήποτε τιμή."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
@@ -2187,37 +2209,29 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
 msgid "Error while communicating with server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Αλλαγή"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή."
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Διαγραφή {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Αλλαγή {0} αντικειμένου"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Αφαίρεση \"{0}\" για {1} \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Ρύθμιση {0}={1} για {2} \"{3}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2227,19 +2241,26 @@
 msgstr[1] "αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Αφαίρεση \"{0}\" για {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Ρύθμιση {0}={1} για {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2247,25 +2268,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Διαγραφή {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Διαγραφή {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Αντικρουόμενη σχέση"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2276,11 +2297,11 @@
 "Διαγραφή από την σχέση;"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Διαγραφή από σχέση"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2291,10 +2312,10 @@
 "Διαγραφή απο την σχέση;"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr ""
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2306,20 +2327,20 @@
 "μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Μετακίνηση"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2345,43 +2366,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "αφαίρεση από την επιλογή"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "ΒγάλεΜέλοςΣχέσης"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Περιστροφή"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, 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:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2479,25 +2506,51 @@
 msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "Δεκαδικές Μοίρες"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "Ν"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "Β"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "Δ"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "Α"
@@ -2508,5 +2561,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2526,10 +2579,10 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 msgid "nodes"
-msgstr ""
+msgstr "κόμβοι"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2554,5 +2607,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
 msgid "relations"
-msgstr ""
+msgstr "σχέσεις"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
@@ -2622,5 +2675,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
 msgid "no earliest version found. History is empty."
-msgstr ""
+msgstr "δεν βρέθηκε προγενέστερη έκδοση. Ιστορικό κενό."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
@@ -2628,17 +2681,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2646,16 +2695,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2667,127 +2705,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Άγνωστος ρόλος \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Οδός \"από\" δεν βρέθηκε."
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+msgid "No \"to\" way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "Χωρίς ετικέτα"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "κείμενο"
@@ -2795,5 +2833,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2821,6 +2859,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "φόντο"
@@ -2830,24 +2868,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Η προβολή \"{0}\" είναι σχεδιασμένη για\n"
-"γεωγραφικά πλάτη από 46.1° και 57° μόνο.\n"
-"Χρεισημοποιήστε άλλο σύστημα προβολής αν δεν χρησιμοποιείτε\n"
-"Γαλλικό διακομιστή WMS.\n"
-"Μη κάνετε αποστολή δεδομένων μετά από αυτό το μήνυμα."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2863,30 +2886,24 @@
 "και ξεκινήστε νέο επίπεδο στην νέα ζώνη."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Ζώνη Labert (Γαλλία)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Ζώνη Lambert (Εσθονία)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Μερκατορικός"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
-msgstr ""
+msgstr "Ελβετικό πλέγμα (Ελβετία)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Μετακίνηση {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2898,14 +2915,14 @@
 msgstr "Αδυναμία εγγραφής σελιδοδείκτη."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Το μήνυμα της ημέρας δεν είναι διαθέσιμο"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Λήψη \"Μηνύματος Ημέρας\""
@@ -3096,5 +3113,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3112,5 +3128,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Full Screen"
-msgstr ""
+msgstr "Πλήρης Οθόνη"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
@@ -3156,5 +3172,5 @@
 msgstr "Σμίκρυνση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "κλίμακα"
@@ -3188,8 +3204,13 @@
 msgstr "(κανένα αντικείμενο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "το επίπεδο δεν είναι στη λίστα."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3197,9 +3218,9 @@
 msgstr "Επικοινωνία με τον διακομιστή OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Το αρχείο δεν βρέθηκε"
@@ -3255,8 +3276,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
 msgid "Properties"
-msgstr ""
+msgstr "Ιδιότητες"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3266,10 +3288,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
-msgstr ""
+msgstr "Κόμβοι"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Μέλη"
@@ -3338,5 +3363,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
 msgid "Conflict Resolution"
-msgstr ""
+msgstr "Επίλυση σύγκρουσης"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
@@ -3360,18 +3385,18 @@
 #, java-format
 msgid "item {0} not found in list"
-msgstr ""
+msgstr "το αντικείμενο {0} δεν βρέθηκε στην λίστα"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
 msgid "lock scrolling"
-msgstr ""
+msgstr "κλείδωμα κύλισης"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
 msgid "Compare "
-msgstr ""
+msgstr "Σύγκριση "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
 msgid "My version"
-msgstr ""
+msgstr "Η έκδοση μου"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
@@ -3383,5 +3408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
 msgid "Merged version"
-msgstr ""
+msgstr "Συγχωνευμένη έκδοση"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
@@ -3394,5 +3419,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
 msgid "Their version"
-msgstr ""
+msgstr "Η έκδοση τους"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
@@ -3402,9 +3427,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
 msgid "> top"
-msgstr ""
+msgstr "> κορυφή"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
+"Αντιγραφή στων επιλεγμένων κόμβων μου στην αρχή της λίστας συγχωνευμένων "
+"κόμβων"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
@@ -3454,18 +3481,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
 msgid "Move up the selected elements by one position"
-msgstr ""
+msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα πάνω κατά μία θέση"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
 msgid "Down"
-msgstr ""
+msgstr "Κάτω"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
 msgid "Move down the selected entries by one position"
-msgstr ""
+msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα κάτω κατά μία θέση"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3475,22 +3502,23 @@
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
+"Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
 msgid "Freeze"
-msgstr ""
+msgstr "Πάγωμα"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
-msgstr ""
+msgstr "Πάγωμα της τρέχουσας λίστας συγχωνευμένων στοιχείων"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
 msgid "Unfreeze"
-msgstr ""
+msgstr "Ξεπάγωμα"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
-msgstr ""
+msgstr "Ξεπάγωμα της λίστας συγχωνευμένων στοιχείων και έναρξη συγχώνευσης"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
@@ -3545,4 +3573,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3550,4 +3581,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3557,4 +3589,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3583,7 +3616,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Η σύνδεση απέτυχε."
+msgstr "Η επικοινωνία με τον διακομιστή απέτυχε"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3595,5 +3627,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
 msgid "No, cancel operation"
-msgstr ""
+msgstr "Όχι, ακύρωση της λειτουργίας"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
@@ -3636,5 +3668,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
 msgid "Coordinates:"
-msgstr ""
+msgstr "Συντεταγμένες:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
@@ -3652,5 +3684,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
-msgstr ""
+msgstr "(κανένα)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357
@@ -3660,18 +3692,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
 msgid "not deleted"
-msgstr ""
+msgstr "μη διεγραμένο"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
 msgid "visible (on the server)"
-msgstr ""
+msgstr "ορατό (στον διακομιστή)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
 msgid "not visible (on the server)"
-msgstr ""
+msgstr "μη ορατό (στον διακομιστή)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "ΠΑρακαλώ εισάγετε ένα όνομα για την τοποθεσία."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3681,9 +3712,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
 msgid "Keep my coordiates"
-msgstr ""
+msgstr "Διατήρηση των συντεταγμένων μου"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
 msgid "Keep their coordiates"
-msgstr ""
+msgstr "Διατήρηση των συντεταγμένων τους"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
@@ -3713,7 +3744,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Χωρίς ημερομηνία"
+msgstr "Όχι, ακύρωση"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3745,7 +3775,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "αφαίρεση από την επιλογή"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3756,9 +3785,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Ρόλος"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3776,6 +3807,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
-msgstr ""
+msgstr "<ακαθόριστο>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
@@ -3797,8 +3830,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3809,7 +3842,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3839,5 +3873,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
@@ -3865,5 +3899,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Στοίβα Εντολών"
@@ -3874,6 +3908,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3884,5 +3918,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3891,10 +3925,29 @@
 msgstr "Εναλλαγή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Σωρός Εντολών: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Διένεξη"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Συγχώνευση διενέξεων."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Επίλυση"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Άνοιγμα διαλόγου συγχώνευσης για όλα τα επιλεγμένα αντικείμενα στην παραπάνω "
+"λίστα."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3903,31 +3956,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Επίλυση"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Άνοιγμα διαλόγου συγχώνευσης για όλα τα επιλεγμένα αντικείμενα στην παραπάνω "
-"λίστα."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Διένεξη"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Συγχώνευση διενέξεων."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Διενέξεις: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
-msgstr ""
+msgstr "Επίλυση συγκρούσεων"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
@@ -3937,17 +3966,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
 msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
+msgstr "Εφαρμογή επίλυσης συγκρούσεων και κλείσιμο του διαλόγου"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
 msgid "Apply Resolution"
-msgstr ""
+msgstr "Εφαρμογή επίλυσης"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
 msgid "Apply partial resolutions"
-msgstr ""
+msgstr "Εφαρμογή μερικών επιλύσεων"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
 msgid "Continue resolving"
-msgstr ""
+msgstr "Συνέχιση επίλυσης"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
@@ -3960,45 +3989,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Ιστορικό"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Εμφάνιση του ιστορικού όλων των επιλεγμένων αντικειμένων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Αντικείμενο"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Ημερομηνία"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+"<html>Αποτυχία φόρτωσης ιστορικού από τον διακομιστή. Λεπτομέρειες:<br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "Φόρτωση ιστορικού"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Επαναφορά"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Επαναφορά της κατάστασης όλων των επιλεγμένων αντικειμένων στην έκδοση που "
-"έχει απιλεγεί στη λίστα ιστορικού."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Δεν έχει υλοποιηθεί ακόμη."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Προβολή"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4133,4 +4167,18 @@
 msgid "Add Properties"
 msgstr "Προσθήκη Ιδιοτήτων"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Προσθήκη"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4243,9 +4291,9 @@
 msgstr "Επιλογή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4254,5 +4302,5 @@
 "αριστερή εργαλειοθήκη."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -4283,181 +4331,104 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Εφαρμογή αλλαγών"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Βασικό"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Κατεχόμενο από"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Ετικέτες (κενή τιμή διαγράφει την ετικέτα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Μετακίνηση Πάνω"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Προσθήκη επιλεγμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Προσθήκη επιλεγμένων αντικειμένων ως μέλη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Αφαίρεση Επιλεγμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Αφαίρεση όλων των επιλεγμένων αντικειμένων από την σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Άθλημα"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Διαγραφή της επιλεγμένης πηγής από την λίστα."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Μετακίνηση Κάτω"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Μετακίνηση των επιλεγμένων μελών κάτω"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Λήψη μελών"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "ναι"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "όχι"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Μέλη: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Επεξεργαστής Σχέσεων: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Υπήρχαν συγκρούσεις στην εισαγωγή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Αδυναμία σύνδεσης με το διακομιστή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
-msgstr ""
+msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:67
@@ -4490,21 +4461,21 @@
 msgstr "Επιλέξτε ένα σελιδοδείκτη πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "ελαχ. γ. πλάτος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "ελαχ. γ. μήκος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "μεγ. γ. πλάτος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "μεγ. γ. μήκος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4514,5 +4485,5 @@
 "για να κατεβάσετε μια περιοχή)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr ""
@@ -4664,665 +4635,41 @@
 msgstr "Αριθμοί πλακιδίων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Εικόνες για {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Ανάγνωση GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Ανάγνωση {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Αρχή GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Τέλος GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "διαφορά στη ζώνη ώρας: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "εικόνα"
-msgstr[1] "εικόνες"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} μέσα στο ίχνος"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Συγχρονισμός ρολογιού"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "Εικόνες JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Εικόνα"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "σημείο gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Προσαρμογή του σχεδιασμού γραμμών"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Χρηση καθολικών ρυθμίσεων."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Προσαρμογή Χρώματος"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "Εντάξει"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Προκαθορισμένο"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Επιλέξτε ένα χρώμα"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Σημάδια από Ονομασμένα Σημεία"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Εισαγωγή Ήχου"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Αρχεία Κυματομορφής (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Σημάδια ήχου από {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Εισαγωγή εικόνων"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} τροχιά, "
-msgstr[1] "{0} τροχιές, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} διαδρομή, "
-msgstr[1] "{0} διαδρομές, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} σημείο αναφοράς"
-msgstr[1] "{0} σημεία αναφοράς"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Όνομα: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Περιγραφή: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Διάρκεια: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Μήκος: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Μετατροπή σε επίπεδο δεδομένων"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θερείτε "
-"βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Μετατράπηκε από: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Λήψη όλων εντός:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} μέτρα"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Μέγιστη περιοχή ανά αίτημα:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} τετρ. χλμ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Αυτή η ενέργεια {0} ξεχωριστές<br>αιτήσεις λήψης. Επιθυμείτε<br>να "
-"συνεχίσετε;</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "εκτός περιοχής λήψης"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "το {0} αποτελείται από:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} διαγράφηκαν.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Μετατροπή σε επίπεδο GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "ίχνος"
-msgstr[1] "ίχνη"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "σημείο"
-msgstr[1] "σημεία"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "ένα ίχνος με {0} σημείο"
-msgstr[1] "ένα ίχνος με {0} σημεία"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "το {0} αποτελείται από {1} ίχνος"
-msgstr[1] "το {0} αποτελείται από {1} ίχνη"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} σημείο"
-msgstr[1] "{0} σημεία"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "σημάδι gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "σημάδι"
-msgstr[1] "σημάδια"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} αποτελείται από {1} σημάδι"
-msgstr[1] "{0} αποτελείται από {1} σημάδια"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Συγχρονισμός ήχου"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Ήχος συγχρονισμένος στο σημείο {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr "Αδυναμία συγχρονισμού στο επίπεδο που αναπαράγεται."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Αδυναμία δημιουργίας νέου σημαδιού ήχου."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-"Παρουσιάστηκε σφάλμα κατά την προσπάθεια προβολής URL για αυτό το σημάδι"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "Το URL ήταν: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Σφάλμα στην εμφάνιση του URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Προχωρημένες προτιμήσεις"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Απ' ευθείας Ρύθμιση Προτιμήσεων. Χρησιμοποιήστε με προσοχή!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Η τρέχουσα τιμή είναι η προεπιλεγμένη."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Η προεπιλεγμένη τιμή είναι \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Η προεπιλεγμένη τιμή είναι άγνωστη αυτή τη στιγμή (η ρύθμιση δεν έχει "
-"χρησιμοποιηθεί ακόμα)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Νέα τιμή για {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Εισάγεται ένα νέο ζεύγος κλειδιού/τιμής"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Εμφάνιση του μενού Ήχου"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Ονομασμένα σημεία ίχνους."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Αρχή της διαδρομής (θα το κάνει πάντοτε εάν δεν υπάρχουν άλλα επιλεγμένα "
-"σημεία διαθέσιμα)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Εμφάνιση ή απόκρυψη του μενού ήχου από την κύρια γραμμή μενού"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Κατα την εισαγωγή ήχου, δημιουργία σημαδιών από..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Βαθμονόμηση καταγραφέα ήχου"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Χρώμα"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "Ιστορικό για {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "Κλείσιμο του διαλόγου"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Κόμβος {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6032,5 +5379,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6181,40 +5529,726 @@
 msgstr "Όνομα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Έκδοση {0} δημιουργήθηκε στις {1} από {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Έκδοση"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Εικόνες για {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Ανάγνωση GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Ανάγνωση {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Αρχή GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Τέλος GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "διαφορά στη ζώνη ώρας: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "εικόνα"
+msgstr[1] "εικόνες"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} μέσα στο ίχνος"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Συγχρονισμός ρολογιού"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "Εικόνες JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Εικόνα"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "σημείο gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Προσαρμογή του σχεδιασμού γραμμών"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Χρηση καθολικών ρυθμίσεων."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Προσαρμογή Χρώματος"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "Εντάξει"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Προκαθορισμένο"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Επιλέξτε ένα χρώμα"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Σημάδια από Ονομασμένα Σημεία"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Εισαγωγή Ήχου"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Αρχεία Κυματομορφής (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Σημάδια ήχου από {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Εισαγωγή εικόνων"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} τροχιά, "
+msgstr[1] "{0} τροχιές, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} διαδρομή, "
+msgstr[1] "{0} διαδρομές, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} σημείο αναφοράς"
+msgstr[1] "{0} σημεία αναφοράς"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Όνομα: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Περιγραφή: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Διάρκεια: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Μήκος: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Μετατροπή σε επίπεδο δεδομένων"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θερείτε "
+"βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Μετατράπηκε από: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Λήψη όλων εντός:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} μέτρα"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Μέγιστη περιοχή ανά αίτημα:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} τετρ. χλμ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Αυτή η ενέργεια {0} ξεχωριστές<br>αιτήσεις λήψης. Επιθυμείτε<br>να "
+"συνεχίσετε;</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+"Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Επίπεδο Δεδομένων {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "εκτός περιοχής λήψης"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "έκδοση {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "το {0} αποτελείται από:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} διαγράφηκαν.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "Έκδοση API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Μετατροπή σε επίπεδο GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "ίχνος"
+msgstr[1] "ίχνη"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "σημείο"
+msgstr[1] "σημεία"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "ένα ίχνος με {0} σημείο"
+msgstr[1] "ένα ίχνος με {0} σημεία"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "το {0} αποτελείται από {1} ίχνος"
+msgstr[1] "το {0} αποτελείται από {1} ίχνη"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} σημείο"
+msgstr[1] "{0} σημεία"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "σημάδι gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "σημάδι"
+msgstr[1] "σημάδια"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} αποτελείται από {1} σημάδι"
+msgstr[1] "{0} αποτελείται από {1} σημάδια"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Συγχρονισμός ήχου"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Ήχος συγχρονισμένος στο σημείο {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr "Αδυναμία συγχρονισμού στο επίπεδο που αναπαράγεται."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Αδυναμία δημιουργίας νέου σημαδιού ήχου."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+"Παρουσιάστηκε σφάλμα κατά την προσπάθεια προβολής URL για αυτό το σημάδι"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "Το URL ήταν: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Σφάλμα στην εμφάνιση του URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Προχωρημένες προτιμήσεις"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Απ' ευθείας Ρύθμιση Προτιμήσεων. Χρησιμοποιήστε με προσοχή!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Αναζήτηση: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Η τρέχουσα τιμή είναι η προεπιλεγμένη."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Η προεπιλεγμένη τιμή είναι \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Η προεπιλεγμένη τιμή είναι άγνωστη αυτή τη στιγμή (η ρύθμιση δεν έχει "
+"χρησιμοποιηθεί ακόμα)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Νέα τιμή για {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Εισάγεται ένα νέο ζεύγος κλειδιού/τιμής"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Εμφάνιση του μενού Ήχου"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Ονομασμένα σημεία ίχνους."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+"Αρχή της διαδρομής (θα το κάνει πάντοτε εάν δεν υπάρχουν άλλα επιλεγμένα "
+"σημεία διαθέσιμα)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Εμφάνιση ή απόκρυψη του μενού ήχου από την κύρια γραμμή μενού"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Κατα την εισαγωγή ήχου, δημιουργία σημαδιών από..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Βαθμονόμηση καταγραφέα ήχου"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Χρώμα"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Επίπεδο: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Επιλέξτε"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Επιλέξτε ένα χρώμα για {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Χρώματα που χρησιμοποιούνται από διάφορα αντικείμενα στο JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6223,29 +6257,29 @@
 msgstr "Όλα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+msgstr "Τοπικά αρχεία"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgstr "Κανένα"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Σχεδιασμός μεγάλων σημείων GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgstr "Ταχύτητα (κόκκινο = αργό, πράσινο = γρήγορο)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -6253,5 +6287,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6272,5 +6306,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6308,5 +6342,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6319,50 +6353,50 @@
 msgstr "Πεζοί"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Σχεδιασμός Βελών Κατεύθυνσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Γρήγορος σχεδιασμός (δείχνει άσχημος)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Σχεδιασμός αριθμών σειράς τμημάτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Σχεδιασμός ορίων δεδομένων που έχουν ληφθεί"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Σχεδιασμός εικονικών κόμβων σε κατάσταση επιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Εξομάλυνση γραφικών χάρτη (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6370,9 +6404,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+msgstr "Μέγιστο μήκος για τοπικά αρχεία (μέτρα)"
+
+#: ../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."
@@ -6381,25 +6415,25 @@
 "σχεδιασμό όλων των γραμμών."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Μέγιστο μήκος (μέτρα)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Σχεδιασμός βελών κατεύθυνσης για γραμμές που συνδέουν σημεία GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6407,13 +6441,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Ελάχιστη απόσταση (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Σχεδιασμός μεγαλύτερων κουκίδων για τα σημεία GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6421,9 +6455,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Χρωματισμός σημείων και τμημάτων ιχνών ανάλογα με την ταχύτητα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6431,27 +6465,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Χρωματισμός Ιχνών και Σημείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "Σημεία GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -6459,27 +6493,27 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "Δεδομένα OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Δημιουργία αντιγράφων ασφαλείας"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
@@ -6487,82 +6521,102 @@
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Εμφάνιση οθόνης έναρξης στην εκκίνηση"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Εμφάνιση ID αντικειμένου στις λίστες επιλογών"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Όψη και Αίσθηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Προεπιλογή (οριζόμενο αυτόματα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Ενεργοποίηση ενσωματωμένων προεπιλογών"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Ενεργοποίηση ενσωματωμένων προεπιλογών"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Ρύθμιση διαθέσιμων πρόσθετων."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Λήψη λίστας"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Ρύθμιση τοποθεσιών..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Παρακαλώ επιλέξτε μια επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+msgstr "Επεξεργασία URL περιγραφής  πρόσθετου του JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Ρύθμιση τοποθεσιών πρόσθετων"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Ρυθμίσεις απεικόνισης"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6571,81 +6625,81 @@
 "Διάφορες ρυθμίσεις που επηρρεάζουν την εμφάνιση ολόκληρου του προγράμματος."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Ρυθμίσεις σύνδεσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Ρυθμίσεις σύνδεσης για τον διακομηστή OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Ρυθμίσεις Χάρτη"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Ρυθμίσεις για την προβολή χάρτη και την ερμηνεία δεδομένων."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Ρυθμίσεις Ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Ρυθμίσεις για την αναπαραγωγή ήχου και σημαδιών ήχου."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Εμφάνιση συντεταγένων ως"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Μέθοδος προβολής"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Προβολή Χάρτη"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Μέθοδος προβολής"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Εμφάνιση συντεταγένων ως"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Ενεργοποίηση διαμεσολαβητή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Ρυθμίσεις διαμεσολαβητή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Διεύθυνση μεσολαβητή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Θύρα μεσολαβητή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Όνομα χρήστη διαμεσολαβητή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Κωδικός διαμεσολαβητή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Η βασική URL για τον διακομιστή OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6654,17 +6708,17 @@
 "κωδικός."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Η βασική URL για τον διακομιστή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+msgstr "Όνομα χρήστη OSM (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "Κωδικός OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6679,75 +6733,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Προτιμήσεις Συντομεύσεων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Χειροκίνητη αλλαγή συντομεύσεων πλκτρολογίου."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Συντόμευση"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
-msgid "Sort presets menu"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Ενεργοποίηση ενσωματωμένων προεπιλογών"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Πηγή προεπιλογών ετικετών"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Περιγραφή: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Επίπεδο: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Συγγραφείς: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Βοήθεια: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Έκδοση {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Αντιγραφή Προξαθορισμένου"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Προσθήκη νέας πηγής στην λίστα."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
 msgid "Delete the selected source from the list."
 msgstr "Διαγραφή της επιλεγμένης πηγής από την λίστα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+msgid "Sort presets menu"
+msgstr "Ταξινόμηση μενού προεπιλογών"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Προεπιλογές Ετικετών"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Πηγές προεπιλογών ετικετών"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Διαχωριστική γραμμή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Γραμμή Εργαλείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Διαθέσιμο"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Προσαρμογή Γραμμής εργαλείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Προσαρμογή των στοιχείων της γραμμής εργαλείων."
@@ -6952,5 +7039,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 msgid "Apply Preset"
-msgstr ""
+msgstr "Εφαρμογή Προεπιλογής"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687
@@ -7000,6 +7087,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7010,5 +7097,5 @@
 #, java-format
 msgid "File \"{0}\" does not exist"
-msgstr ""
+msgstr "Το αρχείο \"{0}\" δεν υπάρχει"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7151,5 +7238,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Login"
-msgstr ""
+msgstr "Είσοδος"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128
@@ -7224,5 +7311,5 @@
 #, java-format
 msgid "Unknown version: {0}"
-msgstr ""
+msgstr "Άγνωστη έκδοση: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
@@ -7302,5 +7389,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72
 msgid "Downloading history..."
-msgstr ""
+msgstr "Λήψη ιστορικού..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28
@@ -7324,5 +7411,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7332,15 +7419,15 @@
 msgstr "{0}% ({1}/{2}), {3} απομένουν. Αποστολή {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Ενημέρωση πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Λήψη Πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7353,32 +7440,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
 msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
+msgstr[0] "{0} πρόσθετο φορτώθηκε με επιτυχία. Παρακαλώ επανεκκινήστε το JOSM."
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+"{0} πρόσθετα φορτώθηκαν με επιτυχία. Παρακαλώ επανεκκινήστε το JOSM."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
+msgstr "Λήψη πρόσθετου {0}..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
-msgstr ""
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr "Απαιτείται η έκδοση {0} του JOSM για το πρόσθετο {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+msgstr "Λήψη Πρόσθετου"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
-msgstr ""
+msgstr "Παράλειψη Λήψης"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -7427,6 +7515,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Απενεργοποίηση πρόσθετου"
@@ -7440,7 +7528,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 msgid "Keep plugin"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+msgstr "Διατήρηση πρόσθετου"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7450,5 +7538,5 @@
 "άδεια αντικατάστασης των υπαρχόντων."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7458,10 +7546,10 @@
 "''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Σώμφωνα με τις πληροφορίες του πρόσθετου, ο συγγραφέας είναι{0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7470,9 +7558,9 @@
 "κάντε αναφορά για bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Να απενεργοποιηθεί το πρόσθετο;"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7482,5 +7570,5 @@
 "να αποφορτωθεί το πρόσθετο."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7490,19 +7578,19 @@
 "πήρατε το JOSM για το πρόβλημα."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Πληροφορίες"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "δεν υπάρχει περιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+msgstr "Περισσότερες λεπτομέρειες"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7511,13 +7599,13 @@
 msgstr[1] "Έγινε λήψη πληροφοριών πρόσθετων από {0} τοποθεσίες"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Δεν βρέθηκαν πληροφορίες πρόσθετων."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Όλα τα εγκατεστημένα πρόσθετα είναι ενημεωμένα."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7530,9 +7618,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Λήψη πρόσθετων που λείπουν"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7545,6 +7633,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7567,14 +7655,14 @@
 msgstr "άγνωστο"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Έκδοση {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Πρόσθετα που έρχονται με το JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7834,45 +7922,45 @@
 "{0} χμ/ω"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Εξαγωγή τοποθεσιών GPS από EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Έναρξη σάρωσης καταλόγου"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Ένα από τα επιλεγμένα αρχεία ήταν μηδενικό !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Ανάγνωση φωτογραφιών"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Σάρωση καταλόγου {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7881,5 +7969,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 msgid "Open images with AgPifoJ..."
-msgstr ""
+msgstr "Άνοιγμα εικόνων  με το AgPifoJ..."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
@@ -7996,5 +8084,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
 msgid "Correlate"
-msgstr ""
+msgstr "Συσχέτιση"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -8073,20 +8161,20 @@
 msgstr "Δευτερόλεπτα: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Διαφορά ώρας {0} ημερών)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8094,13 +8182,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Ρύθμιση ζώνης ώρας και απόκλεισης"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8122,5 +8210,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Σφάλμα φόρτωσης αρχείου"
@@ -8439,5 +8527,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:27
 msgid "Adjust WMS"
-msgstr ""
+msgstr "Ρύθμιση WMS"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35
@@ -8461,5 +8549,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Άδειο επίπεδο"
@@ -8562,17 +8650,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Σφάλμα μορφής αρχείου"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "Επιτυχία εισαγωγής NMEA"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Αποτυχία εισαγωγής NMEA!"
+msgid "TCX Files (*.tcx)"
+msgstr "Αρχεία GPX (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8597,5 +8687,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8616,11 +8706,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8629,6 +8719,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr ""
@@ -8691,6 +8781,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Ανανέωση"
@@ -8787,9 +8877,9 @@
 #: ../plugins/grid/src/grid/GridPlugin.java:27
 msgid "Add grid"
-msgstr ""
+msgstr "Προσθήκη πλέγματος"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
 msgid "Normal"
-msgstr ""
+msgstr "Κανονική"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:57
@@ -8848,5 +8938,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:45
 msgid "Open images with ImageWayPoint"
-msgstr ""
+msgstr "Άνοιγμα εικόνων με το ImageWayPoint"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81
@@ -8874,5 +8964,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
-msgstr ""
+msgstr "Lake Walker"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
@@ -8996,7 +9086,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "νερό"
@@ -9297,5 +9387,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
 msgid "OpenStreetBugs download loop"
-msgstr ""
+msgstr "Βρόχος λήψης OpenStreetBugs"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
@@ -9337,14 +9427,14 @@
 "λεκτικό"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Άνοιμα OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9391,5 +9481,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
 msgid "Please enter a user name"
-msgstr ""
+msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
@@ -9441,5 +9531,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25
 msgid "change the selection"
-msgstr ""
+msgstr "αλλαγή της επιλογής"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -9457,9 +9547,9 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "Remote Control"
-msgstr ""
+msgstr "Απομακρυσμένος έλεγχος"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "Settings for the Remote Control plugin."
-msgstr ""
+msgstr "Ρυθμίσεις για το πρόσθετο Απομακρυσμένου Ελέγχου."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
@@ -9474,19 +9564,19 @@
 msgstr "Επιτρεπώμενες ενέργειες"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Θέλετε να το επιτρέψετε;"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9527,33 +9617,33 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
 msgid "Add routing layer"
-msgstr ""
+msgstr "Προσθήκη επιπέδου δρομολόγησης"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
 msgid "Criteria"
-msgstr ""
+msgstr "Κριτήρια"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Shortest"
-msgstr ""
+msgstr "Συντομότερη"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
 msgid "Fastest"
-msgstr ""
+msgstr "Ταχύτερη"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
 msgid "Reverse route"
-msgstr ""
+msgstr "Αναστροφή διαδρομής"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
 msgid "Clear route"
-msgstr ""
+msgstr "Καθαρισμός διαδρομής"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
 msgid "Routing Plugin Preferences"
-msgstr ""
+msgstr "Προτιμήσεις πρόσθετου Δρομολόγησης"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
 msgid "Configure routing preferences."
-msgstr ""
+msgstr "Ρύθμιση προτιμήσεων δρομολόγησης"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
@@ -9563,5 +9653,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Speed (Km/h)"
-msgstr ""
+msgstr "Ταχύτητα (ΧΑΩ)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
@@ -9610,7 +9700,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Αποστολή..."
+msgstr "φόρτωση εικόνας..."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9625,5 +9714,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "SlippyMap"
-msgstr ""
+msgstr "SlippyMap"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
@@ -9677,5 +9766,5 @@
 #, java-format
 msgid "Error while exporting {0}: {1}"
-msgstr ""
+msgstr "Σφάλμα κατά την εξαγωγή {0}: {1}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
@@ -9745,5 +9834,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
 msgid "<multiple>"
-msgstr ""
+msgstr "<πολλαπλές>"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
@@ -9767,15 +9856,15 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
+msgstr "Αντικείμενο"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
 msgid "Filter"
-msgstr ""
+msgstr "Φίλτρο"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:61
 msgid "Clear"
-msgstr ""
+msgstr "Καθαρισμός"
 
 #. should not happen
@@ -9800,13 +9889,4 @@
 msgstr ""
 
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Εισαγωγή αρχείου TCX..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Εισαγωγή αρχείου TCX ως ίχνος GPS"
-
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
 msgid "Reverse a terrace"
@@ -9861,5 +9941,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:474
 msgid "Interpolation"
-msgstr ""
+msgstr "Παρεμβολή"
 
 #. item "Buildings/Addresses" text "House name"
@@ -9871,5 +9951,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
 msgid "Optional"
-msgstr ""
+msgstr "Προαιρετικό"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
@@ -9888,5 +9968,5 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99
 msgid "Open User Page in browser"
-msgstr ""
+msgstr "Άνοιγμα Σελίδας Χρήστη στον φυλλομετρητή"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112
@@ -9908,5 +9988,5 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165
 msgid "Sorry, doesn't work with anonymous users"
-msgstr ""
+msgstr "Συγνώμη, δεν δουλεύει για ανόνυμους χρήστες"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
@@ -9924,5 +10004,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 msgid "Continue anyway"
-msgstr ""
+msgstr "Συνέχεια έτσι κι αλλιώς"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133
@@ -9946,5 +10026,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
 msgid "Please abort if you are not sure"
-msgstr ""
+msgstr "Παρακαλώ ακυρώστε αν δεν είστε σίγουροι"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
@@ -9954,9 +10034,9 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
 msgid "No intersection found. Nothing was changed."
-msgstr ""
+msgstr "Δεν βρέθηκε διασταύρωση. Τίποτα δεν αλλάχθηκε."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Προστέθηκε κόμβος σε όλες τις διασταυρώσεις"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
@@ -9966,5 +10046,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Fix relations"
-msgstr ""
+msgstr "Δίορθωση σχέσεων"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
@@ -9984,5 +10064,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
 msgid "Fix tag conflicts"
-msgstr ""
+msgstr "Διόρθωση συγκρούσεων ετικετών"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464
@@ -10014,33 +10094,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+msgstr "Ζουμ (σε μέτρα)"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+msgstr "URL"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10109,5 +10189,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use the error layer to display problematic elements."
-msgstr ""
+msgstr "Χρήση του επιπέδου σφαλμάτων για την προβολή προβληματικών στοιχείων."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
@@ -10121,5 +10201,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
 msgid "On demand"
-msgstr ""
+msgstr "Κατ΄απαίτηση"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
@@ -10135,14 +10215,14 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid "Data validator"
-msgstr ""
+msgstr "Επαλήθευση δεδομένων"
 
 #. * Error messages
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
 msgid "Errors"
-msgstr ""
+msgstr "Σφάλματα"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
 msgid "validation error"
-msgstr ""
+msgstr "σφάλμα επαλήθευσης"
 
 #. * Warning messages
@@ -10175,5 +10255,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
 msgid "Data with errors. Upload anyway?"
-msgstr ""
+msgstr "Δεδομένα με σφάλματα. Αποστολή;"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
@@ -10215,5 +10295,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
 msgid "Single elements"
-msgstr ""
+msgstr "Μεμονομένα στοιχεία"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
@@ -10232,5 +10312,5 @@
 #, java-format
 msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr ""
+msgstr "Αντικατάσταση \"{0}\" με \"{1}\" για"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
@@ -10240,5 +10320,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "This test checks that coastlines are correct."
-msgstr ""
+msgstr "Αυτή η δοκιμή ελέγχει ότι οι ακτογραμμές είναι σωστές."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
@@ -10348,23 +10428,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Ελεγκτής ιδιοτήτων:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10375,5 +10455,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10381,78 +10461,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Το κλειδί \"{0}\" δεν είναι έγκυρο."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Ετικέτες χωρίς τιμές"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+msgstr "Το κλειδί \"{0}\" δεν υπάρχει στις προεπιλογές"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+msgstr "Η τιμή \"{0}\" για το κλειδί \"{1}\" δεν υπάρχει στις προεπιλογές."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+msgstr "FIXMES"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+msgstr "Έλεγχος τιμών ιδιοτήτων."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10460,74 +10540,83 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+msgstr "Προσθήκη νέας πηγής στην λίστα."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+msgstr "Επιξεργασία της επιλεγμένης πηγής."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+msgstr "Πηγές δεδομένων"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+msgstr "Έλεγχος τιμών ιδιοτήτων."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+msgstr "Έλεγχος για FIXMES."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+msgid "Use default tag ignore file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Χρήση του προεπιλεγμένου αρχείου ορθογραφικού ελέγχου (προτείνεται)"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+msgstr "Χρήση του προεπιλεγμένου αρχείου ορθογραφικού ελέγχου (προτείνεται)"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+msgstr "Διόρθωση ιδιοτήτων"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+msgstr "Δεν βρέθηκε ο τύπος του στοιχείου"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10672,7 +10761,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "κτίριο"
@@ -10686,5 +10775,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr ""
@@ -10694,25 +10783,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10735,17 +10824,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Κόμβος"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr ""
@@ -10783,14 +10877,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Δημιοθργήθηκε εξαίρεση"
@@ -10847,5 +10941,5 @@
 #, java-format
 msgid "WMS: {0}"
-msgstr ""
+msgstr "WMS: {0}"
 
 #. This service serves the purpose of "just this once" without forcing the user
@@ -10855,5 +10949,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
 msgid "Custom WMS Link"
-msgstr ""
+msgstr "Προσαρμοσμένος σύνδεσμος WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
@@ -10863,5 +10957,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
 msgid "Visit Homepage"
-msgstr ""
+msgstr "Επισκευθείτε την Κεντρική Σελίδα"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
@@ -10886,7 +10980,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
 msgid "Adjust the position of the selected WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+msgstr "Ρύθμιση της θέσης του επιλεγμένου επιπέδου WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10899,15 +10993,15 @@
 msgstr "Αυτόματη λήψη"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -10915,58 +11009,58 @@
 "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Λήψη εμφανών πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Αλλαγή ανάλυσης"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Ανανέωση λανθασμένων πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Κανάλι άλφα"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgstr "Αποθήκευση επιπέδου WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Φόρτωση επιπέδου WMS από αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+msgstr "Φόρτωση επιπέδου WMS"
+
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Σφάλμα μορφής αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Προτιμήσεις πρόσθετου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
@@ -10974,45 +11068,34 @@
 "πρόσθετου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Όνομα μενού"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Όνομα Μενού (Προκαθορισμένο)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Προκαθορισμένο)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Εισάγετε ένα όνομα μενού και ένα WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Αντιγραφή Προξαθορισμένου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Λήψη"
 
 #. *
@@ -11048,10 +11131,10 @@
 #: build/specialmessages.java:10
 msgid "Audio Device Unavailable"
-msgstr ""
+msgstr "Μη διαθέσιμη Συσκευή Ήχου"
 
 #. Java message loading audio data
 #: build/specialmessages.java:11
 msgid "You must make your edits public to upload new data"
-msgstr ""
+msgstr "Πρέπει να κάνετε τις αλλαγές σας δημόσιες για να στείλετε νέα δεδομένα"
 
 #. Plugin AgPifoJ
@@ -11091,5 +11174,5 @@
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Επιτρέπει την εισαγωγή διαφόρων τύπων αρχείων απ' ευθείας στο JOSM."
 
 #. Plugin DirectUpload
@@ -11165,5 +11248,5 @@
 #: build/trans_plugins.java:37
 msgid "Imports issues from OpenStreetBugs"
-msgstr ""
+msgstr "Εισάγει προβλήματα από OpenStreetBugs"
 
 #. Plugin openvisible
@@ -11194,10 +11277,10 @@
 #: build/trans_plugins.java:47
 msgid "Let other applications send commands to JOSM."
-msgstr ""
+msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM."
 
 #. Plugin routing
 #: build/trans_plugins.java:49
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Παρέχει δυνατότητες δρομολόγησης."
 
 #. Plugin slippymap
@@ -11226,16 +11309,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11244,5 +11322,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11251,5 +11329,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11258,10 +11336,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12058,4 +12136,64 @@
 msgstr "Πρόσβαση"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "ναι"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12079,5 +12217,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "ιδιωτικό"
@@ -12125,5 +12263,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "προορισμός"
@@ -12160,5 +12298,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12177,4 +12315,28 @@
 msgid "agricultural"
 msgstr "αγροτικό"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "όχι"
 
 #: build/trans_presets.java:315
@@ -12274,15 +12436,15 @@
 #: build/trans_presets.java:326
 msgid "Max. Height (meters)"
-msgstr ""
+msgstr "Μέγιστο Ύψος (μέτρα)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
 #: build/trans_presets.java:327
 msgid "Max. Width (meters)"
-msgstr ""
+msgstr "Μέγιστο Πλάτος (μέτρα)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
 #: build/trans_presets.java:328
 msgid "Max. Length (meters)"
-msgstr ""
+msgstr "Μέγιστο Μήκος (μέτρα)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
@@ -12390,6 +12552,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "Αυτοκινητόδρομος"
@@ -12415,6 +12577,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr ""
@@ -12440,6 +12602,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "πρωτεύων"
@@ -12465,6 +12627,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "δευτερεύων"
@@ -12478,5 +12640,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr ""
@@ -12494,5 +12656,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "Οικιστική"
@@ -12510,5 +12672,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12535,6 +12714,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr ""
@@ -12584,5 +12763,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "κυκλικός κόμβος"
@@ -13561,5 +13740,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "έλος"
@@ -13944,5 +14123,5 @@
 #: build/trans_presets.java:1306
 msgid "Crossing type"
-msgstr ""
+msgstr "Είδος Διάβασης"
 
 #. item "Railway/Crossing" check "Crossing attendant"
@@ -14278,5 +14457,5 @@
 #: build/trans_presets.java:2349
 msgid "Shelter"
-msgstr ""
+msgstr "Καταφύγιο"
 
 #. item "Public Transport/Bus Stop" check "Shelter"
@@ -14640,10 +14819,10 @@
 #: build/trans_presets.java:1655
 msgid "Theme Park"
-msgstr ""
+msgstr "Θεματικό Πάρκο"
 
 #. item
 #: build/trans_presets.java:1656
 msgid "Edit Theme Park"
-msgstr ""
+msgstr "Επεξεργασία Θεματικού Πάρκου"
 
 #. item "Tourism/Theme Park" text "Name"
@@ -14882,10 +15061,10 @@
 #: build/trans_presets.java:1777
 msgid "Fishing"
-msgstr ""
+msgstr "Ψάρεμα"
 
 #. item
 #: build/trans_presets.java:1778
 msgid "Edit Fishing"
-msgstr ""
+msgstr "Επεξεργασία Ψαρέματος"
 
 #. item "Leisure/Fishing" text "Name"
@@ -15290,27 +15469,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "άθληση"
@@ -17228,5 +17407,5 @@
 #: build/trans_presets.java:2524
 msgid "Sports"
-msgstr ""
+msgstr "Αθλητικά"
 
 #. item
@@ -17595,5 +17774,5 @@
 #: build/trans_presets.java:2731
 msgid "Political"
-msgstr ""
+msgstr "Πολιτικό"
 
 #. item
@@ -17605,5 +17784,5 @@
 #: build/trans_presets.java:2737
 msgid "National park"
-msgstr ""
+msgstr "Εθνικό πάρκο"
 
 #. item
@@ -18148,8 +18327,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "ποδήλατο"
@@ -18218,8 +18397,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr ""
@@ -18245,5 +18424,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "υπόγειος"
@@ -18373,4 +18552,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18379,4 +18559,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18385,4 +18566,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18391,4 +18573,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18452,7 +18635,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "γέφυρα"
@@ -18510,4 +18693,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18633,7 +18817,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18716,15 +18900,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr ""
@@ -18766,5 +18950,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "άλογο"
@@ -18974,11 +19158,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -19016,6 +19200,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "οδός"
@@ -19071,7 +19255,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -19127,8 +19311,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr ""
@@ -19149,5 +19333,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19161,5 +19345,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19180,5 +19364,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr ""
@@ -19193,5 +19377,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19206,5 +19390,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "όχθη ποταμού"
@@ -19218,5 +19402,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "υδατόρρευμα"
@@ -19230,5 +19414,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "προβλήτα"
@@ -19256,5 +19440,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "υδαταγωγός"
@@ -19422,13 +19606,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr ""
@@ -19490,7 +19674,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19513,10 +19697,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19536,7 +19720,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19544,8 +19731,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19590,6 +19781,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19603,5 +19794,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr ""
@@ -19623,5 +19814,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19635,5 +19826,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19681,7 +19872,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr ""
@@ -19698,5 +19889,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "πίστα εύκολη"
@@ -19711,5 +19902,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "πίστα μεσαία"
@@ -19724,5 +19915,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "πίστα προχορημένη"
@@ -19737,5 +19928,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19750,5 +19941,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19763,5 +19954,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "πιστα αρχαρίων"
@@ -19866,10 +20057,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19883,5 +20074,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "προβλήτα"
@@ -19895,5 +20086,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "αγωγός"
@@ -20021,12 +20212,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "αναψυχή"
@@ -20040,5 +20231,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr ""
@@ -20110,8 +20301,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20213,10 +20404,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20602,22 +20793,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20649,6 +20840,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20709,8 +20900,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "υγεία"
@@ -21063,26 +21254,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "κατάστημα"
@@ -21154,8 +21345,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "ξενοδοχείο"
@@ -21305,9 +21496,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "τουρισμός"
@@ -21379,8 +21570,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "ιστορικό"
@@ -21451,8 +21642,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21466,5 +21657,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "λατομείο"
@@ -21478,5 +21669,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "Χ.Υ.Τ.Α."
@@ -21498,5 +21689,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "λεκάνη"
@@ -21510,5 +21701,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "δάσος"
@@ -21522,5 +21713,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21543,5 +21734,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr ""
@@ -21555,5 +21746,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "βιομηχανική"
@@ -21567,5 +21758,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21579,5 +21770,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21591,5 +21782,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21646,7 +21837,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "στρατιωτική"
@@ -21660,5 +21851,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "κοιμητήριο"
@@ -21671,5 +21862,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "κορυφή"
@@ -21684,5 +21875,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "παγετώνας"
@@ -21696,5 +21887,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "ηφαίστειο"
@@ -21749,8 +21940,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr ""
@@ -21764,5 +21955,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr ""
@@ -21776,5 +21967,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr ""
@@ -21788,5 +21979,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "άλσος"
@@ -21800,5 +21991,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "λάσπη"
@@ -21812,5 +22003,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "παραλία"
@@ -21888,10 +22079,10 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
-msgstr ""
+msgstr "διαδρομή"
 
 #. color route
@@ -21937,7 +22128,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "όριο"
@@ -22079,10 +22270,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr ""
@@ -22130,6 +22321,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "διεύθυνση"
@@ -22214,5 +22405,5 @@
 #: build/trans_surveyor.java:93 build/trans_surveyor.java:97
 msgid "Test"
-msgstr ""
+msgstr "Δοκιμή"
 
 #. JOSM TagChecker validator file
@@ -22360,10 +22551,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Άνοιγμα Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22371,5 +22562,5 @@
 msgstr "Χάρτες NPE"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22377,52 +22568,117 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Δεδομένα OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Ποδηλατόδρομος"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Streets NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
-msgstr ""
-
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+msgstr "Terraserver Topo"
+
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
-msgstr ""
+msgstr "Terraserver Urban"
+
+#~ msgid "Data Layer"
+#~ msgstr "Επίπεδο δεδομένων"
+
+#~ msgid "Change"
+#~ msgstr "Αλλαγή"
+
+#~ msgid "Rotate"
+#~ msgstr "Περιστροφή"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 46.1° and 57° only.\n"
+#~ "Use another projection system if you are not using\n"
+#~ "a French WMS server.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "Η προβολή \"{0}\" είναι σχεδιασμένη για\n"
+#~ "γεωγραφικά πλάτη από 46.1° και 57° μόνο.\n"
+#~ "Χρεισημοποιήστε άλλο σύστημα προβολής αν δεν χρησιμοποιείτε\n"
+#~ "Γαλλικό διακομιστή WMS.\n"
+#~ "Μη κάνετε αποστολή δεδομένων μετά από αυτό το μήνυμα."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Διενέξεις: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Πηγή προεπιλογών ετικετών"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Πηγές προεπιλογών ετικετών"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Εισαγωγή αρχείου TCX..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Εισαγωγή αρχείου TCX ως ίχνος GPS"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Επικάλυψη πλακιδίων"
+
+#~ msgid "% of lat:"
+#~ msgstr "% γεωγ. πλάτους:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% γεωγ. μήκους:"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Αποστολή δεδομένων"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Δεν έχει υλοποιηθεί ακόμη."
+
 #~ msgid "Email"
 #~ msgstr "Email"
@@ -22430,4 +22686,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Επίλυση Διενέξεων"
+
+#~ msgid "Object"
+#~ msgstr "Αντικείμενο"
 
 #~ msgid "{0} object has conflicts:"
@@ -22468,4 +22727,17 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα"
+
+#~ msgid "Revert"
+#~ msgstr "Επαναφορά"
+
+#~ msgid "Date"
+#~ msgstr "Ημερομηνία"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Επαναφορά της κατάστασης όλων των επιλεγμένων αντικειμένων στην έκδοση "
+#~ "που έχει απιλεγεί στη λίστα ιστορικού."
 
 #~ msgid "Add either site-josm.xml or Wiki Pages."
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 16400)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 16407)
@@ -10,7 +10,7 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-22 16:57+0000\n"
-"Last-Translator: Peter Brodersen <Unknown>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-30 04:16+0000\n"
+"Last-Translator: Brian Burns <bereavementkiss@gmail.com>\n"
 "Language-Team: British English <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:17+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -27,6 +27,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -34,30 +34,31 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "The projection could not be read from preferences. Using Mercator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Hint: Some changes came from uploading new data to the server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Unsaved Changes"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "There are unsaved changes. Discard the changes and continue?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Save and Exit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Discard and Exit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -70,12 +71,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -89,7 +90,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -100,32 +101,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoring malformed URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoring malformed file URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "About"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Display the about screen."
@@ -133,10 +134,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -144,25 +145,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Last change at {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Bug Reports"
@@ -172,5 +174,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -178,27 +180,27 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Readme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revision"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Contribution"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "About JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "File could not be found."
@@ -210,14 +212,15 @@
 "OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"WARNING: unexpected format of API base URL. Redirection to history page for "
+"OSM primitive will probably fail. API base URL is: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Please select at least one node or way."
+msgstr "Please select at least one already uploaded node, way, or relation."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Warning"
@@ -229,4 +232,6 @@
 "primitives only"
 msgstr ""
+"WARNING: launching browser windows for the first {0} of {1} selected "
+"primitives only"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -272,5 +277,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Latitude"
@@ -279,5 +284,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Longitude"
@@ -285,5 +290,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Align Nodes in Circle"
@@ -296,5 +301,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -353,18 +358,19 @@
 "{0}, max is {1}"
 msgstr ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "API Capabilities Violation"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "Failed to initialise API. Please try again later."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Not initialized"
+msgstr "API initialisation failed"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -374,4 +380,6 @@
 "{1}"
 msgstr ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
@@ -381,48 +389,49 @@
 "length {2}. Values length is {3}."
 msgstr ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Precondition violation"
+msgstr "Precondition Violation"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgstr "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflict"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "download"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom to {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom the view to {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -432,9 +441,9 @@
 msgstr "View: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Nothing selected to zoom to."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "No conflicts to zoom to"
@@ -528,37 +537,41 @@
 msgstr "Please select something to copy."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Create Circle"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Create a circle from three selected nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Please select exactly three nodes or one way with exactly three nodes."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Those nodes are not in a circle."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Please select exactly three nodes or one way with exactly three nodes."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Delete"
@@ -608,5 +621,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -715,11 +728,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -730,5 +744,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Error"
@@ -738,30 +752,30 @@
 msgstr "Choose a predefined licence"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM Online Help"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Open in Browser"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Edit"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -769,19 +783,19 @@
 msgstr "Reload"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Can only edit help pages from JOSM Online Help"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Error while loading page {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -798,18 +812,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Display history information about OSM ways or nodes."
+msgstr "Display history information about OSM ways, nodes, or relations."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "History of Element"
+msgstr "Info about Element"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Display history information about OSM ways or nodes."
+msgstr "Display object information about OSM nodes, ways, or relations."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -870,5 +881,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Mirror"
@@ -907,10 +918,10 @@
 msgstr "right"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Move {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -918,5 +929,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Cannot move objects outside of the world."
@@ -1110,5 +1121,5 @@
 msgstr "File {0} exists. Overwrite?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1118,26 +1129,25 @@
 "a bug."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "No document open so nothing to save."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Empty document"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "The document contains no data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Save anyway"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1147,36 +1157,36 @@
 "if you rejected all. Continue?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Reject Conflicts and Save"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Save OSM file"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Save GPX file"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Save Layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Could not back up file."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Unknown file extension."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "An error occurred while saving."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "An error occurred while restoring backup file."
@@ -1228,6 +1238,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Close"
@@ -1298,10 +1309,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"A role based relation membership was copied to all new ways.\n"
+"A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 
@@ -1482,68 +1492,68 @@
 msgstr "Selection empty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Upload to OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Upload all changes to the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Objects to add:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Objects to modify:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Objects to delete:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Provide a brief comment for the changes you are uploading:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Upload these changes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Upload Changes"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Nothing to upload. Get some data first."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "There are unresolved conflicts. You have to resolve these first."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "No changes to upload."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Uploading"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr "Updating primitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchronize {0} {1} only"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Synchronize entire dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1564,17 +1574,17 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Conflict detected"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "unexpected return value. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1589,10 +1599,10 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1605,9 +1615,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr "Precondition violation"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1620,18 +1630,18 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr "Primitive already deleted"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Error header \"{0}\" does not match expected pattern \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "Upload to OSM API failed"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1738,24 +1748,15 @@
 msgstr "Raw GPS data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Downloading data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "No data imported."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Data Layer {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Data Layer"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1773,5 +1774,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>There are {0} primitives in your local dataset which<br>might be "
@@ -1784,6 +1785,6 @@
 "deleted on the server. If you later try to delete or<br>update them the "
 "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check these primitives individually.<br>Click <strong>{2}</strong> to "
-"ignore.<br></html>"
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
@@ -1802,5 +1803,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1903,5 +1904,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Release the mouse button to select the objects in the rectangle."
@@ -1912,5 +1913,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Release the mouse button to stop rotating."
@@ -1928,7 +1929,7 @@
 "+release to synchronise audio at that point."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1936,9 +1937,9 @@
 msgstr "Select"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Select, move and rotate objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1947,5 +1948,28 @@
 msgstr[1] "Add and move a virtual new node to {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Move left"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Move left"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Undo"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1953,5 +1977,5 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1970,5 +1994,5 @@
 msgstr "Zoom and move map"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2238,35 +2262,27 @@
 msgstr "Error while communicating with server."
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Add"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Change"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Delete {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Change {0} object"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Remove \"{0}\" for {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Set {0}={1} for {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2276,19 +2292,26 @@
 msgstr[1] "objects"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Remove \"{0}\" for {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Set {0}={1} for {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
 msgstr "ChangeRelationMemberRole"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2296,25 +2319,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr "cannot resolve undecided conflict"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Delete {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Delete {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Conflicting relation"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2325,11 +2348,11 @@
 "Delete from relation?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2340,10 +2363,10 @@
 "Delete from relation?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Split way segment"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2355,20 +2378,20 @@
 "be using them.<br>Do you really want to delete?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "Resolve conflicts in deleted state in {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Move"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2384,5 +2407,5 @@
 #, java-format
 msgid "removing reference from way {0}"
-msgstr ""
+msgstr "removing reference from way {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
@@ -2396,9 +2419,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid "removing reference from relation {0}"
-msgstr "Removed Element from Relations"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+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}"
@@ -2406,34 +2429,41 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+#, fuzzy, java-format
+msgid "RemoveRelationMember {0} {1}"
 msgstr "RemoveRelationMember"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Rotate"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Delete {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sequence"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../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:41
+#: ../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:52
+#: ../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
+#, fuzzy
+msgid "Main.ds doesn't include node {0}"
+msgstr "My dataset does not include a tag with key {0}"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2530,25 +2560,51 @@
 msgstr "Could not load preferences from server."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "parameter ''{0}'' must not be null"
+
+#: ../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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "W"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "E"
@@ -2559,5 +2615,5 @@
 msgstr "parameter {0} > 0 required. Got {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2582,5 +2638,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2679,17 +2735,13 @@
 msgstr "no latest version found. History is empty."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr "Didn't find an primitive with id {0} in this dataset"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr "Didn't find an primitive with id {0} and version {1} in this dataset"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr "Didn't find an historized primitive with id {0} in this dataset"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2697,16 +2749,5 @@
 msgstr "parameter ''{0}'' > 0 expected, got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr "parameter ''{0}'' must not be null"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
@@ -2718,127 +2759,127 @@
 msgstr "parameter {0} not in range 0..{1}, got {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Area style way is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipolygon way ''{0}'' is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Deleted member ''{0}'' in relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Way ''{0}'' with less than two points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr "More than one \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "More than one \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "More than one \"via\" found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unknown role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unknown member type for ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "No \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "No \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "No \"via\" node or way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Style for restriction {0} not found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "No useful role ''{0}'' for Way ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-Way ''{0}'' in multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "No outer way for multipolygon ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersection between ways ''{0}'' and ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Inner way ''{0}'' is outside."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Style for inner way ''{0}'' equals multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Style for outer way ''{0}'' mismatches."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "untagged"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "text"
@@ -2846,5 +2887,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2853,4 +2894,7 @@
 "Keeping my primitive. "
 msgstr ""
+"My primitive with id {0} and version {1} is visible although their primitive "
+"with lower version {2} is not visible. Can't deal with this inconsistency. "
+"Keeping my primitive. "
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -2872,6 +2916,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "background"
@@ -2881,24 +2925,9 @@
 msgstr "highlight"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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."
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
 msgstr ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2914,36 +2943,24 @@
 "and start a new layer on the new zone."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambert Zone (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Move {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2955,14 +2972,14 @@
 msgstr "Could not write bookmark."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Message of the day not available"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- running version is {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Downloading \"Message of the day\""
@@ -3155,5 +3172,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3215,5 +3231,5 @@
 msgstr "Zoom out"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "scale"
@@ -3247,8 +3263,13 @@
 msgstr "(no object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "layer not in list."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3256,9 +3277,9 @@
 msgstr "Contacting the OSM server..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Error while parsing"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "File not found"
@@ -3319,4 +3340,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3326,4 +3348,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "Nodes"
@@ -3331,5 +3355,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Members"
@@ -3539,7 +3564,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3622,4 +3647,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3627,4 +3655,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3636,4 +3665,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3655,14 +3685,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Error while communicating with server."
+msgstr ""
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Error when communicating with server."
+msgstr "Communication with server failed"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3729,7 +3760,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
-#, fuzzy
 msgid "Visible State:"
-msgstr "Deleted State:"
+msgstr "Visible State:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
@@ -3750,22 +3780,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
-#, fuzzy
 msgid "visible (on the server)"
-msgstr "Primitive deleted on the server"
+msgstr "visible (on the server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
-#, fuzzy
 msgid "not visible (on the server)"
-msgstr "Primitive deleted on the server"
+msgstr "not visible (on the server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Please enter a name for the location."
+msgstr "Keep a clone of the local version"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
-#, fuzzy
 msgid "Physically delete from local dataset"
-msgstr "My version (local dataset)"
+msgstr "Physically delete from local dataset"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
@@ -3794,18 +3820,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
-#, fuzzy
 msgid "Keep my visible state"
-msgstr "Keep my deleted state"
+msgstr "Keep my visible state"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Yes, undelete them too"
+msgstr "Yes, reset the id"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "No date"
+msgstr "No, abort"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3816,17 +3839,19 @@
 "agree?</html>"
 msgstr ""
+"<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} to "
+"0.<br>On the next upload the server will assign<br>it a new id.<br>Do yo "
+"agree?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Reset id to 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
-#, fuzzy
 msgid "Keep their visible state"
-msgstr "Keep their deleted state"
+msgstr "Keep their visible state"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
-msgstr ""
+msgstr "Yes, purge it"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
@@ -3836,23 +3861,25 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
+"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
+"dataset.<br>Do you agree?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "remove from selection"
+msgstr "Remove from dataset"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
-#, fuzzy
 msgid "Undecide conflict between visible state"
-msgstr "Undecide conflict between deleted state"
+msgstr "Undecide conflict between visible state"
 
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Role"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitive"
@@ -3870,4 +3897,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<undefined>"
@@ -3891,8 +3920,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3903,7 +3932,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3959,5 +3989,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Command Stack"
@@ -3968,6 +3998,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3978,5 +4008,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3985,10 +4015,27 @@
 msgstr "Toggle: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Command Stack: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Conflict"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Merging conflicts."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Resolve"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Open a merge dialogue of all selected items in the list above."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3997,26 +4044,4 @@
 msgstr ""
 "Set the selected elements on the map to the selected items in the list above."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Resolve"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Open a merge dialogue of all selected items in the list above."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Conflict"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Merging conflicts."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Conflicts: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -4057,45 +4082,48 @@
 "resolving conflicts.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Click Reload to refresh list"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "History"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Display the history of all selected items."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Object"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Date"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr "<html>Failed to load history from the server. Details:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "index out of bounds Got {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr "History item"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "Load history"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr "Loading history for {0} with id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Reload all currently selected objects and refresh the list."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Revert"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-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."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Not implemented yet."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Show"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr "Display the history of the selected primitive"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4228,4 +4256,18 @@
 msgid "Add Properties"
 msgstr "Add Properties"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Add"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4338,9 +4380,9 @@
 msgstr "Selection: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Undock the panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4348,5 +4390,5 @@
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Click to minimise/maximise the panel content"
@@ -4376,179 +4418,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Apply Changes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Basic"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Occupied By"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "linked"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (empty value deletes tag)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Move Up"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Move the currently selected members up"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Add Selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Add all currently selected objects as members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Remove Selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Remove all currently selected objects from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Delete the selected source from the list."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Move Down"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Move the currently selected members down"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Remove the member in the current table row from this relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Download all incomplete ways and nodes in relation"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "yes"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "no"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Members: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relation Editor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "There were conflicts during import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Error parsing server response."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Cannot connect to server."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr "Error when communicating with server."
@@ -4583,21 +4548,21 @@
 msgstr "Select a bookmark first."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4607,5 +4572,5 @@
 "area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Bounding Box"
@@ -4754,682 +4719,42 @@
 msgstr "Tile Numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Images for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Read GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "No time for point {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Cannot read time \"{0}\" from point {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "No images with readable timestamps found."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Reading {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Geotagged Images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS end: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "current delta: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "timezone difference: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "image"
-msgstr[1] "images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} within the track."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Sync clock"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG images (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "The date in file \"{0}\" could not be parsed."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "There is no EXIF time within the file \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Image"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS unit timezone (difference to photo)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchronise Time with GPS Unit"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Time entered could not be parsed."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps point"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Customise line drawing"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Use global settings."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Select line drawing options"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Customise Colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Default"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Choose a colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Markers From Named Points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Named Trackpoints from {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Import Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio markers from {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Import images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} track, "
-msgstr[1] "{0} tracks, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} route, "
-msgstr[1] "{0} routes, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Name: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Description: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Timespan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Length: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Convert to data layer"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "History for {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "Close the dialogue"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr "history not initialised yet. Failed to set reference primitive."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr "failed to set reference. reference id {0} doesn't match history id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
 msgstr ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Converted from: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Download from OSM along this track"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Download everything within:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metres"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Maximum area per request:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} sq km"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "outside downloaded area"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "version {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "There were {0} conflicts during import."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} consists of:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} deleted.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "unset"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "API version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Convert to GPX layer"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "track"
-msgstr[1] "tracks"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "point"
-msgstr[1] "points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "a track with {0} point"
-msgstr[1] "a track with {0} points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} consists of {1} track"
-msgstr[1] "{0} consists of {1} tracks"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} point"
-msgstr[1] "{0} points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "gps marker"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "marker"
-msgstr[1] "markers"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} consists of {1} marker"
-msgstr[1] "{0} consists of {1} markers"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Synchronise Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-"You need to pause audio at the moment when you hear your synchronisation cue."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Audio synchronised at point {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Make Audio Marker at Play Head"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "No existing audio markers in this layer to offset from."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronise."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Unable to create new audio marker."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "There was an error while trying to display the URL for this marker"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL was: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Error displaying URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Advanced Preferences"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Setting Preference entries directly. Use with caution!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Search: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Current value is default."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Default value is ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Default value currently unknown (setting has not been used yet)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Please select the row to edit."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "New value for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Please select the row to delete."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Enter a new key/value pair"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Display the Audio menu."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Label audio (and image and Web) markers."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Display live audio trace."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Create non-audio markers when reading GPX."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Explicit waypoints with valid timestamps."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Explicit waypoints with time estimated from track position."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Named trackpoints."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Modified times (time stamps) of audio files."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "Start of track (will always do this if no other markers available)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Show or hide the audio menu entry on the main menu bar."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Display a moving icon representing the point on the synchronised track where "
-"the audio currently playing was recorded."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Put text labels against audio (and image and Web) markers as well as their "
-"button icons."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "When importing audio, make markers from..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "When importing audio, apply it to any waypoints in the GPX layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"The number of seconds to jump forwards or back when the relevant button is "
-"pressed"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Forwards/back time (seconds)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "The amount by which the speed is multiplied for fast forwarding"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Fast forwards multiplier"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Lead-in time (seconds)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr "The ratio of voice recorder elapsed time to true elapsed time"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Voice recorder calibration"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Colour"
+"failed to set reference. reference version {0} not available in history"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr "history not initialised yet. Failed to set current primitive."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr "failed to set current. current version {0} not available in history"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Node {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6139,5 +5464,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6288,40 +5614,745 @@
 msgstr "Name"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Version {0} created on {1} by {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Version"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Images for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Read GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "No time for point {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Cannot read time \"{0}\" from point {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "No images with readable timestamps found."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Reading {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Geotagged Images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS end: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "current delta: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "timezone difference: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "image"
+msgstr[1] "images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} within the track."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Sync clock"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG images (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "The date in file \"{0}\" could not be parsed."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "There is no EXIF time within the file \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Image"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS unit timezone (difference to photo)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchronise Time with GPS Unit"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Time entered could not be parsed."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps point"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Customise line drawing"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Use global settings."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Select line drawing options"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Customise Colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Default"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Choose a colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Markers From Named Points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Named Trackpoints from {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Import Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio markers from {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Import images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} track, "
+msgstr[1] "{0} tracks, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} route, "
+msgstr[1] "{0} routes, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Name: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Description: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Timespan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Length: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Convert to data layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Converted from: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Download from OSM along this track"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Download everything within:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metres"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Maximum area per request:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} sq km"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Data Layer {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "outside downloaded area"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "There were {0} conflicts during import."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} consists of:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} deleted.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "unset"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "API version: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Convert to GPX layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "track"
+msgstr[1] "tracks"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "point"
+msgstr[1] "points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "a track with {0} point"
+msgstr[1] "a track with {0} points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} consists of {1} track"
+msgstr[1] "{0} consists of {1} tracks"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} point"
+msgstr[1] "{0} points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "gps marker"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "marker"
+msgstr[1] "markers"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} consists of {1} marker"
+msgstr[1] "{0} consists of {1} markers"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Synchronise Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+"You need to pause audio at the moment when you hear your synchronisation cue."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Audio synchronised at point {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Make Audio Marker at Play Head"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "No existing audio markers in this layer to offset from."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronise."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Unable to create new audio marker."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "There was an error while trying to display the URL for this marker"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL was: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Error displaying URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Advanced Preferences"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Setting Preference entries directly. Use with caution!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Search: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Current value is default."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Default value is ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Default value currently unknown (setting has not been used yet)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Please select the row to edit."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "New value for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Please select the row to delete."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Enter a new key/value pair"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Display the Audio menu."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Label audio (and image and Web) markers."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Display live audio trace."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Create non-audio markers when reading GPX."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Explicit waypoints with valid timestamps."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Explicit waypoints with time estimated from track position."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Named trackpoints."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Modified times (time stamps) of audio files."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "Start of track (will always do this if no other markers available)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Show or hide the audio menu entry on the main menu bar."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Display a moving icon representing the point on the synchronised track where "
+"the audio currently playing was recorded."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Put text labels against audio (and image and Web) markers as well as their "
+"button icons."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "When importing audio, make markers from..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "When importing audio, apply it to any waypoints in the GPX layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"The number of seconds to jump forwards or back when the relevant button is "
+"pressed"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Forwards/back time (seconds)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "The amount by which the speed is multiplied for fast forwarding"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Fast forwards multiplier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Lead-in time (seconds)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr "The ratio of voice recorder elapsed time to true elapsed time"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Voice recorder calibration"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Paint style {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Layer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Choose"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Choose a colour for {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Set to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Set all to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Colours used by different objects in JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Colours"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6330,29 +6361,29 @@
 msgstr "All"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Local files"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "None"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Force lines if no segments imported."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Draw large GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocity (red = slow, green = fast)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -6360,5 +6391,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6379,5 +6410,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6415,5 +6446,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6426,50 +6457,50 @@
 msgstr "Foot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Only interesting direction hints (e.g. with oneway tag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Draw virtual nodes in select mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Draw inactive layers in other colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Smooth map graphics (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6479,9 +6510,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (meters)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6489,10 +6520,10 @@
 "Maximum length (in metres) to draw lines. Set to '-1' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6500,10 +6531,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6511,5 +6542,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6519,13 +6550,13 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6535,9 +6566,9 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6547,136 +6578,157 @@
 "capture device needs to logs that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track coloring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM Data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Keep backup files"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "When saving, keep backup files ending with a ~"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Show splash screen at startup"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Show object ID in selection lists"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Draw rubber-band helper line"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Modeless working (Potlatch style)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Do not require to switch modes (potlatch style workflow)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Look and Feel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Default (Auto determined)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Language"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Enable built-in defaults"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Enable built-in defaults"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Piste type"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Configure available plugins."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Download List"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Update"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Configure Sites..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr "Add JOSM Plugin description URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Please select an entry."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr "Edit JOSM Plugin description URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Configure Plugin Sites"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Display Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6686,81 +6738,81 @@
 "program."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Connection Settings for the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Map Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Settings for the map projection and data interpretation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Audio Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Settings for the audio player and audio markers."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "You have to restart JOSM for some settings to take effect."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Display coordinates as"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Projection method"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Map Projection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Projection method"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Display coordinates as"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Enable proxy server"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Proxy Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Proxy server host"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Proxy server port"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Proxy server username"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Proxy server password"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "The base URL for the OSM server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Login name (e-mail) to the OSM account."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6768,17 +6820,17 @@
 "Login password to the OSM account. Leave blank to not store any password."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Base Server URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr "OSM username (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM password"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6796,77 +6848,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Shortcut Preferences"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Changing keyboard shortcuts manually."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Action"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Description: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Layer: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Authors: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Help: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Copy Default"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Please select the row to copy."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Add a new source to the list."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Delete the selected source from the list."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Sort presets menu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Enable built-in defaults"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Tagging preset source"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Add a new tagging preset source to the list."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Delete the selected source from the list."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Tagging Presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Tagging preset sources"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Separator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Toolbar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Available"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Toolbar customisation"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Customise the elements on the toolbar."
@@ -7141,6 +7224,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7149,7 +7232,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "File {0} exists. Overwrite?"
+msgstr "File \"{0}\" does not exist"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7157,5 +7240,5 @@
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Parsing file \"{0}\" failed"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
@@ -7166,10 +7249,10 @@
 #, java-format
 msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
-msgstr ""
+msgstr "no primitive with id {0} in local dataset. Can't infer primitive type"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
+msgstr "Server replied with response code 404 for id {0}. Skipping."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
@@ -7178,4 +7261,6 @@
 "for each primitive"
 msgstr ""
+"Server replied with response code 404, retrying with an individual request "
+"for each primitive"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -7211,5 +7296,5 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51
 msgid "NMEA import faliure!"
-msgstr "NMEA import faliure!"
+msgstr "NMEA import failure!"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
@@ -7471,8 +7556,8 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
@@ -7484,15 +7569,15 @@
 msgstr "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Update Plugins"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Download Plugins"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7505,5 +7590,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7512,23 +7597,23 @@
 msgstr[1] "{0} Plugins successfully downloaded. Please restart JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Downloading Plugin {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
 msgid "Skip download"
 msgstr "Skip download"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "JOSM version {0} required for plugin {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Download Plugin"
 msgstr "Download Plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr "Skip Download"
@@ -7578,6 +7663,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Disable plugin"
@@ -7592,5 +7677,5 @@
 msgstr "Keep plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7600,5 +7685,5 @@
 "overwrite the existing ones."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7607,10 +7692,10 @@
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "According to the information within the plugin, the author is {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7618,9 +7703,9 @@
 "Try updating to the newest version of this plugin before reporting a bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Should the plugin be disabled?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7630,5 +7715,5 @@
 "unload the plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7638,19 +7723,19 @@
 "about the problem."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "no description available"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "More details"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7659,13 +7744,13 @@
 msgstr[1] "Downloaded plugin information from {0} sites"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "No plugin information found."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "All installed plugins are up to date."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7678,9 +7763,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Download missing plugins"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7693,6 +7778,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7715,14 +7800,14 @@
 msgstr "unknown"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin bundled with JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7981,45 +8066,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extracting GPS locations from EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Starting directory scan"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "One of the selected files was null !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Read photos..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Unable to get canonical path for directory {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanning directory {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Found null file in directory {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Correlate to GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8229,20 +8314,20 @@
 msgstr "Seconds: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Matched {0} of {1} photos to GPX track."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Time difference of {0} days)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Offset between track and photos: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8252,13 +8337,13 @@
 "adjust the sliders to manually match the photos."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Matching photos to track failed"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Adjust timezone and offset"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Default Values"
@@ -8280,5 +8365,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Error loading file"
@@ -8635,5 +8720,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Blank Layer"
@@ -8738,20 +8823,22 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS Files (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr "Format errors: "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "TangoGPS import success"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "TangoGPS import failure!"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "File Format Error"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA import success"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "NMEA import faliure!"
+msgid "TCX Files (*.tcx)"
+msgstr "TangoGPS Files (*.log)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8776,5 +8863,5 @@
 msgstr "Create duplicate way"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Layer for editing GPX tracks"
@@ -8795,11 +8882,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Import path from GPX layer"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Drop existing path"
@@ -8808,6 +8895,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "No GPX data layer found."
@@ -8870,6 +8957,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Refresh"
@@ -9178,7 +9265,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "water"
@@ -9488,8 +9575,11 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>The openstreetbugs plugin is using the old server at appspot.com.<br>A "
+"new server is available at schokokeks.org.<br>Do you want to switch to the "
+"new server? (Strongly recommended)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Switch to new openstreetbugs server?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -9516,14 +9606,14 @@
 msgstr "Header contains several values and cannot be mapped to a single string"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Open OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Opens the OpenStreetBugs window and activates the automatic download"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9658,19 +9748,19 @@
 msgstr "Permitted actions"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Do you want to allow this?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9787,5 +9877,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Flush Tile Cache"
-msgstr ""
+msgstr "Flush Tile Cache"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
@@ -9794,7 +9884,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Uploading..."
+msgstr "image loading..."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9984,13 +10073,4 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "You have to specify tagging preset sources in the preferences first."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Import TCX File..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Import TCX file as GPS track"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10204,33 +10284,33 @@
 msgstr "Opens a dialog that allows to jump to a specific location"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Enter Lat/Lon to jump to position."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "You can also paste an URL from www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoom (in metres)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Jump there"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Jump to Position"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr "Could not parse Latitude, Longitude or Zoom. Please check."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Unable to parse Lon/Lat"
@@ -10548,23 +10628,23 @@
 "This test checks for ways with similar names that may have been misspelt."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Properties checker :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "This plugin checks for errors in property keys and values."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Invalid tagchecker line - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Invalid spellcheck line: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10575,5 +10655,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Illegal tag/value combinations"
@@ -10581,78 +10661,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Painting problem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Key ''{0}'' invalid."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Tags with empty values"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Invalid property key"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Invalid white space in property key"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Property values start or end with white space"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Property values contain HTML entity"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Key ''{0}'' not in presets."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Presets do not contain property key"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Value ''{0}'' for key ''{1}'' not in presets."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Presets do not contain property value"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Check property keys."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Validate that property keys are valid checking against list of words."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Use complex property checker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr "Validate property values and tags using complex rules."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "TagChecker source"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10662,74 +10742,84 @@
 "org/index.php/User:JLS/speller) or tag checking data files."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Add a new source to the list."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Edit the selected source."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Data sources"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Check property values."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr "Validate that property values are valid checking against presets."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Check for FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Looks for nodes or ways with FIXME in any property value."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Check for paint notes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Check if map painting found data errors."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Use default data file."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Use the default data file (recommended)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Use default data file."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Use the default data file (recommended)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Use default spellcheck file."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Use the default spellcheck file (recommended)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Fix properties"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Could not find element type"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Could not find warning level"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Illegal expression ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10874,7 +10964,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "building"
@@ -10888,5 +10978,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "area"
@@ -10896,25 +10986,25 @@
 msgstr "Unclosed way"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Unconnected ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "This test checks if a way has an endpoint very near to another way."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Way end node near other highway"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Way end node near other way"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Way node near other way"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Connected way end node near other way"
@@ -10937,17 +11027,22 @@
 msgstr "This test checks for untagged, empty and one node ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Unnamed ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Edit Junction"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Untagged ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Empty ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "One node ways"
@@ -10985,14 +11080,14 @@
 msgstr "Select a starting node on the end of a way"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr "Reached the end of the line"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr "Reached a junction"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Exception occurred"
@@ -11114,5 +11209,5 @@
 msgstr "Adjust the position of the selected WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11127,15 +11222,15 @@
 msgstr "Automatic downloading"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11143,102 +11238,91 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Open a blank WMS layer to load data from a file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "WMS Plugin Preferences"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modify list of WMS servers displayed in the WMS plugin menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Menu Name"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Menu Name (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Enter a menu name and WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Copy Default"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Please select the row to copy."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr "Overlap tiles"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% of lat:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% of lon:"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Download"
 
 #. *
@@ -11327,5 +11411,5 @@
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Allows to import various file formats into JOSM directly."
 
 #. Plugin DirectUpload
@@ -11485,16 +11569,11 @@
 "the jar-file as standalone as well."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Directly load TCX files from JOSM."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11505,5 +11584,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11514,5 +11593,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11523,10 +11602,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:67
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:69
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12324,4 +12403,64 @@
 msgstr "Access"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "yes"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12345,5 +12484,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "private"
@@ -12391,5 +12530,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "destination"
@@ -12426,5 +12565,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "permissive"
@@ -12443,4 +12582,28 @@
 msgid "agricultural"
 msgstr "agricultural"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "no"
 
 #: build/trans_presets.java:315
@@ -12656,6 +12819,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "motorway"
@@ -12681,6 +12844,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "trunk"
@@ -12706,6 +12869,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "primary"
@@ -12731,6 +12894,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "secondary"
@@ -12744,5 +12907,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "tertiary"
@@ -12760,5 +12923,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "residential"
@@ -12776,5 +12939,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "service"
@@ -12801,6 +12981,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "construction"
@@ -12850,5 +13030,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "roundabout"
@@ -13827,5 +14007,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "marsh"
@@ -15556,27 +15736,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -18414,8 +18594,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "bicycle"
@@ -18484,8 +18664,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "foot"
@@ -18511,5 +18691,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "subway"
@@ -18639,4 +18819,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18645,4 +18826,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18651,4 +18833,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18657,4 +18840,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18718,7 +18902,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "bridge"
@@ -18776,4 +18960,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18899,7 +19084,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18982,15 +19167,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "deprecated"
@@ -19032,5 +19217,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "horse"
@@ -19240,11 +19425,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "barrier"
@@ -19282,6 +19467,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "street"
@@ -19337,7 +19522,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "highway_track"
@@ -19393,8 +19578,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "rail"
@@ -19415,5 +19600,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "services"
@@ -19427,5 +19612,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr "ford"
@@ -19446,5 +19631,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "turningcircle"
@@ -19459,5 +19644,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr "emergency_access_point"
@@ -19472,5 +19657,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "riverbank"
@@ -19484,5 +19669,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "stream"
@@ -19496,5 +19681,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "dock"
@@ -19522,5 +19707,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "aqueduct"
@@ -19688,13 +19873,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "manmade"
@@ -19756,7 +19941,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "railwaypoint"
@@ -19779,10 +19964,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "otherrail"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "railover"
@@ -19802,7 +19987,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19810,8 +19998,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "oldrail"
@@ -19856,6 +20048,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "aeroway"
@@ -19869,5 +20061,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminal"
@@ -19889,5 +20081,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -19901,5 +20093,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -19947,7 +20139,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "aerialway"
@@ -19964,5 +20156,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "piste_easy"
@@ -19977,5 +20169,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "piste_intermediate"
@@ -19990,5 +20182,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "piste_advanced"
@@ -20003,5 +20195,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "piste_expert"
@@ -20016,5 +20208,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "piste_freeride"
@@ -20029,5 +20221,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "piste_novice"
@@ -20132,10 +20324,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "power"
@@ -20149,5 +20341,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "pier"
@@ -20161,5 +20353,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "pipeline"
@@ -20287,12 +20479,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "leisure"
@@ -20306,5 +20498,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "marina"
@@ -20376,8 +20568,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "amenity"
@@ -20479,10 +20671,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "amenity_traffic"
@@ -20868,22 +21060,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "amenity_light"
@@ -20915,6 +21107,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "light_water"
@@ -20975,8 +21167,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "health"
@@ -21329,26 +21521,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "shop"
@@ -21420,8 +21612,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotel"
@@ -21571,9 +21763,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "tourism"
@@ -21645,8 +21837,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "historic"
@@ -21717,8 +21909,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "green"
@@ -21732,5 +21924,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "quarry"
@@ -21744,5 +21936,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "landfill"
@@ -21764,5 +21956,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "basin"
@@ -21776,5 +21968,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "forest"
@@ -21788,5 +21980,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "farmyard"
@@ -21809,5 +22001,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "retail"
@@ -21821,5 +22013,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "industrial"
@@ -21833,5 +22025,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "brownfield"
@@ -21845,5 +22037,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "greenfield"
@@ -21857,5 +22049,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "railland"
@@ -21912,7 +22104,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "military"
@@ -21926,5 +22118,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "cemetery"
@@ -21937,5 +22129,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "peak"
@@ -21950,5 +22142,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "glacier"
@@ -21962,5 +22154,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "volcano"
@@ -22015,8 +22207,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "natural"
@@ -22030,5 +22222,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "scrub"
@@ -22042,5 +22234,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "heath"
@@ -22054,5 +22246,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "wood"
@@ -22066,5 +22258,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "mud"
@@ -22078,5 +22270,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "beach"
@@ -22154,8 +22346,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "route"
@@ -22203,7 +22395,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "boundary"
@@ -22345,10 +22537,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "place"
@@ -22396,6 +22588,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "address"
@@ -22626,10 +22818,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22637,5 +22829,5 @@
 msgstr "NPE Maps"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22643,107 +22835,145 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap data"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Cycleway"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK+)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Streets NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr "Terraserver Topo"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr "Terraserver Urban"
 
+#~ msgid "Data Layer"
+#~ msgstr "Data Layer"
+
+#~ msgid "Change"
+#~ msgstr "Change"
+
+#~ msgid "Rotate"
+#~ msgstr "Rotate"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Undeleting Way..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Checking whether node {0} is gone ..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Undeleting relation..."
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Checking whether primitive {0} is gone ..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Keep mine"
-
-#~ msgid "Delete mine"
-#~ msgstr "Delete mine"
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 46.1° and 57° only.\n"
+#~ "Use another projection system if you are not using\n"
+#~ "a French WMS server.\n"
+#~ "Do not upload any data after this message."
 
 #~ msgid ""
-#~ "<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>"
+#~ "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 ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigned a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Conflicts: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Tagging preset source"
 
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "<html>There are <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Selection too big"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Image with path {0} does not exist or is not readable."
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Add a new tagging preset source to the list."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Tagging preset sources"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Import TCX File..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Import TCX file as GPS track"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Overlap tiles"
+
+#~ msgid "% of lat:"
+#~ msgstr "% of lat:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% of lon:"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Directly load TCX files from JOSM."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK+)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Uploading data"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Not implemented yet."
+
 #~ msgid "Email"
 #~ msgstr "E-Mail"
@@ -22751,4 +22981,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Resolve Conflicts"
+
+#~ msgid "Object"
+#~ msgstr "Object"
 
 #~ msgid "{0} object has conflicts:"
@@ -22789,4 +23022,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Resolve {0} conflicts in {1} objects"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Click Reload to refresh list"
+
+#~ msgid "Revert"
+#~ msgstr "Revert"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ 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 "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22962,4 +23211,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -23018,4 +23274,7 @@
 #~ msgstr "Data upload failed for unknown reason"
 
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "Image with path {0} does not exist or is not readable."
+
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Resolve conflicts in member list of relation {0}"
@@ -23030,2 +23289,50 @@
 #~ "Properties in the merged element. They will replace properties in my "
 #~ "elements when merge decisions are applied."
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "Undeleting Way..."
+
+#~ msgid "Checking whether node {0} is gone ..."
+#~ msgstr "Checking whether node {0} is gone ..."
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "Undeleting relation..."
+
+#~ msgid "Checking whether primitive {0} is gone ..."
+#~ msgstr "Checking whether primitive {0} is gone ..."
+
+#~ msgid "Keep mine"
+#~ msgstr "Keep mine"
+
+#~ msgid "Delete mine"
+#~ msgstr "Delete mine"
+
+#~ msgid ""
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
+#~ msgstr ""
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigned a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
+
+#~ msgid ""
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
+#~ msgstr ""
+#~ "<html>There are <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
+
+#~ msgid "Selection too big"
+#~ msgstr "Selection too big"
+
+#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
+#~ msgstr "Didn't find an historized primitive with id {0} in this dataset"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 16400)
+++ applications/editors/josm/i18n/po/es.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-26 22:43+0000\n"
-"Last-Translator: cdavila <cdavilam@jemila.jazztel.es>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-08 14:41+0000\n"
+"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,31 @@
 msgstr "Ayuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "No se puede leer la proyección en las preferencias. Se usa Mercator."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Cambios no guardados"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Existen cambios sin guardar. ¿Desea descartarlos y continuar?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Guardar y salir"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Descartar y salir"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +69,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +88,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +99,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL malformada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de archivo malformado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "DESCONOCIDO"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Acerca de"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Mostrar la pantalla Acerca de..."
@@ -131,10 +132,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,25 +143,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Último cambio en {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Versión de Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Sitio web"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Informe de errores"
@@ -170,5 +172,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +178,27 @@
 msgstr "Información"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Léeme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revisión"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Contribución"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Acerca de JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "No se ha podido encontrar el archivo."
@@ -210,12 +212,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Por favor, seleccione al menos un nodo o vía"
+msgstr "Por favor, seleccione al menos un nodo, vía o relación ya subida."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Advertencia"
@@ -270,5 +271,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Latitud"
@@ -277,5 +278,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Longitud"
@@ -283,5 +284,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Alinear nodos en círculo"
@@ -294,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -351,18 +352,20 @@
 "{0}, max is {1}"
 msgstr ""
+"El número de cambios actuales supera el máximo de modificaciones permitidas, "
+"el actual es {0}, el máximo es {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "Violación de la capacidades del API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 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."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "No iniciado"
+msgstr "Fallo en la inicialización del API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -372,4 +375,6 @@
 "{1}"
 msgstr ""
+"Advertencia: truncar automáticamente el valor de la etiqueta \"{0}\" en la "
+"primitiva suprimida {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
@@ -381,46 +386,45 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Violación de condición previa"
+msgstr "Violación de la condición previa"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgstr "{0} nodos en vía {1} superar el máximo número permitido de nodos {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflicto"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Aumentar la vista a {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -430,9 +434,9 @@
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "No hay nada seleccionado a lo que hacer zoom."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "No hay conflictos sobre los que acercarse"
@@ -525,38 +529,42 @@
 msgstr "Por favor, seleccione algo que copiar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Crear círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 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:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr ""
-"Por favor, elija exactamente tres nodos o una vía con exactamente tres nodos."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Esos nodos no están en un círculo."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr ""
+"Por favor, elija exactamente tres nodos o una vía con exactamente tres nodos."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Borrar"
@@ -608,5 +616,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -715,11 +723,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -730,5 +739,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Error"
@@ -738,30 +747,30 @@
 msgstr "Elegir una licencia predefinida"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "Ayuda en línea de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Abrir en el navegador"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Editar"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -769,19 +778,19 @@
 msgstr "Recargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Sólo se pueden editar páginas de ayuda desde la ayuda en línea de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Error mientras se cargaba la página {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Falta la página de ayuda. Créela en <A HREF=\"{0}\">english</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -798,18 +807,17 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Mostrar informacion del historial de las vías o nodos de OSM"
+msgstr ""
+"Mostrar el historial de información de las vías, nodos o relaciones de OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Histórico del elemento"
+msgstr "Información sobre el elemento"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Mostrar informacion del historial de las vías o nodos de OSM"
+msgstr ""
+"Mostrar información sobre los objetos nodos, formas o relaciones de OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -872,5 +880,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Invertir"
@@ -909,10 +917,10 @@
 msgstr "derecha"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Mover {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -920,5 +928,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Imposible mover objetos fuera del mundo."
@@ -1115,5 +1123,5 @@
 msgstr "El archivo {0} existe. ¿Sobrescribir?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1123,26 +1131,25 @@
 "favor comunique esto como fallo."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Documento vacío"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "El documento no contiene datos."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Guardar igualmente"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Conflictos"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1152,36 +1159,36 @@
 "gestionarán como si rechazara todo. ¿Continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Rechazar conflictos y guardar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Guardar el archivo OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Guardar el archivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Guardar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "No se pudo salvaguardar el archivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Extensión de archivo desconocida."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Ocurrió un error al guardar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Ocurrió un error al restaurar el archivo de salvaguarda."
@@ -1234,6 +1241,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Cerrar"
@@ -1305,12 +1313,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Se ha copiado una membresía de relación basada en roles a todas las vías "
-"nuevas.\n"
-"Debe verificar esto y corregirlo donde sea necesario."
+"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:319
@@ -1491,69 +1497,69 @@
 msgstr "Selección vacía"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Subir todos los cambios al servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Objetos que añadir:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Objetos que modificar:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Objetos que borrar:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Introduzca un breve comentario sobre los cambios que se está subiendo:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "¿Subir estos cambios?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Subir cambios"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algunos datos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr ""
 "Existen algunos conflictos sin resolver. Tienes que solucionarlos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Ningún cambio que subir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Subiendo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr "Actualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar {0} {1} únicamente"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar el conjunto de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1575,17 +1581,17 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Conflicto detectado"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Retorno de valor inexperado. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1601,5 +1607,5 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1608,5 +1614,5 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1619,9 +1625,9 @@
 "es: <br> {0} </ html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1634,18 +1640,18 @@
 "de error es: <br> {0} </ html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr "Primitiva ya eliminada"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
-msgstr "Subida a OSM API fallida"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+msgstr "Subida a la API de OSM fallida"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1659,10 +1665,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
 msgid "Zoom In"
-msgstr "Acercarse"
+msgstr "Acercar"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
 msgid "Zoom Out"
-msgstr "Alejarse"
+msgstr "Alejar"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
@@ -1689,5 +1695,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
 msgid "Faster"
-msgstr "Rápido"
+msgstr "Más rápido"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
@@ -1716,5 +1722,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
 msgid "Play/Pause"
-msgstr "Reproducir/pausar"
+msgstr "Reproducción/Pausa"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
@@ -1734,5 +1740,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
 msgid "Slower"
-msgstr "Lento"
+msgstr "Más lento"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
@@ -1746,5 +1752,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47
 msgid "Downloaded GPX Data"
-msgstr "Datos GPS descargados"
+msgstr "Datos GPX descargados"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78
@@ -1752,24 +1758,15 @@
 msgstr "Datos GPS en bruto"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Descargando datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "No se importó ningún dato."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Capa de Datos {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Datos OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Datos de la capa"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1784,5 +1781,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
 msgid "Errors during Download"
-msgstr "Errores durante la Descarga"
+msgstr "Errores durante la descarga"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
@@ -1795,4 +1792,10 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
+"<html>Hay {0} primitivas en su conjunto local de datos que<br>pueden estar "
+"borradas en el servidor. Si posteriormente trata de borrarlas "
+"o<br>actualizarlas probablemente el servidor informará de un<br>conflicto."
+"<br><br>Pulse <strong>{1}</strong> para comprobar el estado de estas "
+"primitivas<br>en el servidor-<br>Pulse <strong>{2}</strong> para ignorar."
+"<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
@@ -1806,10 +1809,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
 msgid "Delete nodes or ways."
-msgstr "Eliminar nodos o vías"
+msgstr "Borrar nodos o vías."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1863,5 +1866,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Add a new node to an existing way"
-msgstr "Añadir un nuevo nodo a la vía existente"
+msgstr "Añadir un nodo nuevo a una vía existente"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
@@ -1871,10 +1874,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881
 msgid "Create new node."
-msgstr "Crear un nuevo nodo."
+msgstr "Crear un nodo nuevo."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908
 msgid "Select node under cursor."
-msgstr "Seleccione un nodo con el cursor."
+msgstr "Seleccionar el nodo bajo el cursor."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
@@ -1912,7 +1915,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "Soltar el botón del ratón para seleccionar objetos en el rectángulo."
+msgstr ""
+"Soltar el botón del ratón para seleccionar los objetos en el rectángulo."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
@@ -1922,5 +1926,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar el botón del ratón para parar de rotar."
@@ -1939,7 +1943,7 @@
 "en ese punto."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1947,9 +1951,9 @@
 msgstr "Seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Seleccionar, mover y rotar objetos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1958,5 +1962,28 @@
 msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Mover hacia la izquierda"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Mover hacia la izquierda"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Deshacer"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1965,5 +1992,5 @@
 "más cercano."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1980,7 +2007,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
 msgid "Zoom and move map"
-msgstr "Alejar/acercar o mover mapa"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+msgstr "Alejar/acercar y mover mapa"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -1988,5 +2015,5 @@
 msgstr ""
 "Zoom arrastrando o Ctrl +. o Ctrl+,; mover con Ctrl+arriba, izquierda, "
-"abajo, derecha, mover el zoom con el botón derecho\""
+"abajo, derecha; mover el zoom con el botón derecho"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
@@ -1999,5 +2026,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
 msgid "Search for objects."
-msgstr "Búsqueda por objetos"
+msgstr "Búsqueda de objetos."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
@@ -2021,5 +2048,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63
 msgid "remove from selection"
-msgstr "eliminar desde la selección"
+msgstr "eliminar de la selección"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
@@ -2037,5 +2064,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr "<b>\"Calle Mayor\"</b> - 'Calle Mayor' en cualquier clave o valor."
+msgstr "<b>\"Calle Mayor\"</b> - 'Calle Mayor' en cualquier clave o nombre."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
@@ -2045,5 +2072,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
+msgstr "<b>type=route</b> - clave 'type' con el valor exacto 'route'."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
@@ -2069,5 +2096,6 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>type:</b> - tipo de objeto (<b>nodo</b>, <b>vía</b>, <b>relación</b>)"
+"<b>type:</b> - tipo de objeto: node, way, relation (<b>nodo</b>, <b>vía</b>, "
+"<b>relación</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
@@ -2260,35 +2288,27 @@
 msgstr "Error mientras se comunicaba con el servidor"
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Añadir"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Modificar"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Borrar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Modificar objeto {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
-msgstr "Quitar \"{0}\" por {1} ''{2}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+msgstr "Eliminar \"{0}\" de {1} ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Establecer {0}={1} para {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2298,19 +2318,26 @@
 msgstr[1] "objetos"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
-msgstr "Quitar \"{0}\" por {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+msgstr "Eliminar \"{0}\" de {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Establecer {0}={1} para {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
 msgstr "ChangeRelationMemberRole"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2318,25 +2345,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr "no se puede resolver los conflictos pendientes"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Borrar {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Borrar {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Relación con conclicto"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2348,11 +2375,11 @@
 "¿Borrar de la relación?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2363,10 +2390,10 @@
 "¿Borrar de la relación?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Dividir segmento de vía"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2378,20 +2405,20 @@
 "usándolos.<br>¿Realmente quiere borrar?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgstr "Resolver los conflictos en el estado suprimido en {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Mover"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2402,10 +2429,10 @@
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 msgid "Purging 1 primitive"
-msgstr ""
+msgstr "Purgando 1 primitiva"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
 #, java-format
 msgid "removing reference from way {0}"
-msgstr ""
+msgstr "eliminando referencia de vía {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
@@ -2415,11 +2442,13 @@
 "{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:202
-#, fuzzy, java-format
+#, java-format
 msgid "removing reference from relation {0}"
-msgstr "Eliminar elementos de las relaciones"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
@@ -2427,34 +2456,41 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr "Quitar miembro de la relación"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Rotar"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#, fuzzy, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr "Eliminar miembro de la relación"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Borrar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Secuencia"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
 #, java-format
 msgid "Resolve {0} tag conflicts in {1} {2}"
 msgstr "Resolver {0} conflicto de etiquetas en {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+msgstr "Sin eliminar {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:52
+#: ../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
+#, fuzzy
+msgid "Main.ds doesn't include node {0}"
+msgstr "Mi conjunto de datos no incluye una etiqueta con la clave {0}"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2554,25 +2590,51 @@
 msgstr "No se han podido cargar las preferencias desd el servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "el parámetro ''{0}'' no debe ser nulo"
+
+#: ../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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "E"
@@ -2581,7 +2643,7 @@
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+msgstr "parámetro {0} > 0 necesario. Obtenido {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2601,10 +2663,10 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 msgid "nodes"
-msgstr ""
+msgstr "nodos"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2615,5 +2677,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 msgid "ways"
-msgstr ""
+msgstr "vías"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2629,5 +2691,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
 msgid "relations"
-msgstr ""
+msgstr "relaciones"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
@@ -2637,5 +2699,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "changesets"
-msgstr ""
+msgstr "Conjunto de cambios"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
@@ -2667,5 +2729,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138
 msgid "waterway"
-msgstr "camino acuático"
+msgstr "vía fluvial"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:139
@@ -2697,23 +2759,19 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
 msgid "no earliest version found. History is empty."
-msgstr ""
+msgstr "ninguna versión más antigua encontrada. El histórico está vacío."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
 msgid "no latest version found. History is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+msgstr "no se encontró ninguna versión más reciente. El histórico está vacío."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2721,16 +2779,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2742,127 +2789,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Estilo de área sin cerrar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "La vía multipoligonal ''{0}'' no está cerrada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Borrado miembro ''{0}''  en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "La vía ''{0}''  con menos de dos puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr "Encontrado más de un \"desde\" en la vía."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "Encontrado más de un \"hacia\" en la vía."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Encontrada más de una \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rol desconocido ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo desconocido para el miembro \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Ningún \"desde\" encontrado en la vía."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Ningún \"hacia\" encontrado en la vía."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "No se ha especificado una \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "El tramo \"from\" no comienza o termina en un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "El tramo \"to\" no comienza o termina en un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "El tramo \"from\" no comienza o termina en un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "El tramo \"to\" no comienza o termina en un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stilo para la restricción {0} no encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "La no-vía ''{0}'' en multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ninguna vía exterior en el multipolígono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersección entre las vías ''{0}'' y ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "El estilo de la vía exterior ''{0}'' no coincide."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "texto"
@@ -2870,5 +2917,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2896,6 +2943,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "fondo"
@@ -2905,24 +2952,9 @@
 msgstr "resaltar"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"La proyección {0} se ha diseñado \n"
-"solamente para latitudes entre 46.1° y 57°.\n"
-"Use otro sistema de  proyección si no usa\n"
-"un servidor WMS francés.\n"
-"No suba ningún dato después de este mensaje."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2938,36 +2970,24 @@
 "y cree una nueva capa en otra zona."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Zona Lambert (Francia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"La proyección \"{0}\" está diseñada únicamente\n"
-"para latitudes entre 45.7° y 47.9°\n"
-"y longitudes entre 5.7° y 10.6°.\n"
-"Use otro sistema de proyección si no está trabajando\n"
-"con un conjunto de datos relativos a Suiza o Liechtenstein.\n"
-"No suba ningún dato tras haber leido este mensaje."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Rejilla suiza (Suiza)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Mover {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2979,14 +2999,14 @@
 msgstr "No pudieron escribirse los marcadores."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Mensaje del dia no está disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- la versión en ejecución es {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaje del día\""
@@ -3147,5 +3167,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
-msgstr "Ajustes por defecto"
+msgstr "Ajustes predeterminados"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
@@ -3180,5 +3200,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3240,5 +3259,5 @@
 msgstr "Alejarse"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "escalar"
@@ -3272,8 +3291,13 @@
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "capa no listada"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3281,9 +3305,9 @@
 msgstr "Contactando con el servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Error mientras se analizaba sintácticamente"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Archivo no encontrado."
@@ -3315,5 +3339,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
 msgid "My with Their"
-msgstr ""
+msgstr "Mía respecto a la suya"
 
 #. *
@@ -3322,5 +3346,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
 msgid "My with Merged"
-msgstr ""
+msgstr "Mía respecto a la fusionada"
 
 #. *
@@ -3329,5 +3353,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
 msgid "Their with Merged"
-msgstr ""
+msgstr "Suya respecto a la fusionada"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
@@ -3339,8 +3363,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
 msgid "Properties"
-msgstr ""
+msgstr "Propiedades"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3350,10 +3375,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
-msgstr ""
+msgstr "Nodos"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Miembros"
@@ -3361,19 +3389,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
 msgid "No pending tag conflicts to be resolved"
-msgstr ""
+msgstr "Ningún conflito de etiqueta pendiente de ser resuelto"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
 #, java-format
 msgid "Tags({0} conflicts)"
-msgstr ""
+msgstr "Etiquetas ({0} conflictivas)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
+msgstr "{0} etiquetas conflictivas pendientes de ser resueltas"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
 msgid "Nodes(resolved)"
-msgstr ""
+msgstr "Nodos (resueltos)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
@@ -3384,5 +3412,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
 msgid "Nodes(with conflicts)"
-msgstr ""
+msgstr "Nodos (con conflictos)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
@@ -3392,5 +3420,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
 msgid "Members(resolved)"
-msgstr ""
+msgstr "Miembros (resueltos)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
@@ -3402,5 +3430,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
 msgid "Members(with conflicts)"
-msgstr ""
+msgstr "Miembros (con conflictos)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
@@ -3410,9 +3438,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
 msgid "No pending property conflicts"
-msgstr ""
+msgstr "Ninguna propiedad con conflictos pendiente"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
 msgid "Properties(with conflicts)"
-msgstr ""
+msgstr "Propiedades (con conflictos)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
@@ -3422,5 +3450,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
 msgid "Conflict Resolution"
-msgstr ""
+msgstr "Resolución de conflictos"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
@@ -3444,18 +3472,18 @@
 #, java-format
 msgid "item {0} not found in list"
-msgstr ""
+msgstr "objeto {0} no encontrado en la lista"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
 msgid "lock scrolling"
-msgstr ""
+msgstr "bloquear desplazamiento"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
 msgid "Compare "
-msgstr ""
+msgstr "Comparar "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
 msgid "My version"
-msgstr ""
+msgstr "Mi versión"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
@@ -3467,5 +3495,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
 msgid "Merged version"
-msgstr ""
+msgstr "Versión fusionada"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
@@ -3478,5 +3506,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
 msgid "Their version"
-msgstr ""
+msgstr "Su versión"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
@@ -3486,5 +3514,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
 msgid "> top"
-msgstr ""
+msgstr "> arriba"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
@@ -3494,5 +3522,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
 msgid "> bottom"
-msgstr ""
+msgstr "> abajo"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
@@ -3534,5 +3562,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
 msgid "Up"
-msgstr ""
+msgstr "Subir"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
@@ -3542,5 +3570,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
 msgid "Down"
-msgstr ""
+msgstr "Bajar"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
@@ -3549,7 +3577,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3563,18 +3591,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
 msgid "Freeze"
-msgstr ""
+msgstr "Congelar"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
-msgstr ""
+msgstr "Congelar la lista actual de elementos fusionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
 msgid "Unfreeze"
-msgstr ""
+msgstr "Desconjelar"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
+"Descongelar la lista actual de elementos fusionados y conmenzar la fusión"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
@@ -3595,6 +3624,6 @@
 msgid "My version ({0} entry)"
 msgid_plural "My version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mi versión ({0} entrada)"
+msgstr[1] "Mi versión ({0} entradas)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
@@ -3602,6 +3631,6 @@
 msgid "Merged version ({0} entry)"
 msgid_plural "Merged version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Versión fusionada ({0} entrada)"
+msgstr[1] "Versión fusionada ({0} entradas)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
@@ -3609,6 +3638,6 @@
 msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Su versión ({0} entrada)"
+msgstr[1] "Su versión ({0} entradas)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
@@ -3629,9 +3658,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
-msgstr ""
+msgstr "el parámetro '{0}' no debe ser nulo"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3641,4 +3674,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3647,5 +3681,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
 msgid "Node"
-msgstr ""
+msgstr "Nodo"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
@@ -3660,14 +3694,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Error mientras se comunicaba con el servidor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Error mientras se comunicaba con el servidor"
+msgstr "Comunicación fallida con el servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3733,7 +3766,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
-#, fuzzy
 msgid "Visible State:"
-msgstr "Estado borrado:"
+msgstr "Estado visible:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
@@ -3754,29 +3786,26 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
-#, fuzzy
 msgid "visible (on the server)"
-msgstr "Primitiva borrada en el servidor"
+msgstr "visible (en el servidor)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
-#, fuzzy
 msgid "not visible (on the server)"
-msgstr "Primitiva borrada en el servidor"
+msgstr "no visible (en el servidor)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Por favor, introduzca un nombre para la localización."
+msgstr "Mantener un clon de la versión local"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
 msgid "Physically delete from local dataset"
-msgstr ""
+msgstr "Eliminar físicamente desde el conjunto de datos locales"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
 msgid "Keep my coordiates"
-msgstr ""
+msgstr "Mantener mis coordenadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
 msgid "Keep their coordiates"
-msgstr ""
+msgstr "Mantener sus coordenadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
@@ -3786,9 +3815,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
 msgid "Keep my deleted state"
-msgstr ""
+msgstr "Mantener mi estado suprimido"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
 msgid "Keep their deleted state"
-msgstr ""
+msgstr "Mantener su estado suprimido"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
@@ -3798,16 +3827,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
 msgid "Keep my visible state"
-msgstr ""
+msgstr "Mantener mi estado visible"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Sí, deshacer el borrado de ellos también"
+msgstr "Sí, reiniciar el id"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Sin fecha"
+msgstr "No, abortar"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3818,16 +3845,19 @@
 "agree?</html>"
 msgstr ""
+"<html> Para mantener su versión local JOSM <br> tiene que restablecer el "
+"identificador de {0} {1} a 0. <br> En la siguiente subida al servidor se le "
+"asignará<br>un nuevo identificador. <br> ¿Está de acuerdo? </ html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Reiniciar el id a 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
-msgstr ""
+msgstr "Mantener su estado visible"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
-msgstr ""
+msgstr "Sí, purgarlo"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
@@ -3839,21 +3869,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "eliminar desde la selección"
+msgstr "Eliminar desde el conjunto de datos"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
-#, fuzzy
 msgid "Undecide conflict between visible state"
-msgstr "Conflicto no resuelto entre las diferentes coordenadas"
+msgstr ""
 
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rol"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitiva"
@@ -3871,4 +3901,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<indefinido>"
@@ -3886,5 +3918,5 @@
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Mi conjunto de datos no incluye una etiqueta con la clave {0}"
 
 #. setting up the properties table
@@ -3892,8 +3924,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3904,7 +3936,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3921,13 +3954,13 @@
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
-msgstr ""
+msgstr "El parámetro 'col' debe ser 0 o 1. Obtenido {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
 msgid "My version (local dataset)"
-msgstr ""
+msgstr "Mi versión (conjunto de datos locales)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
-msgstr ""
+msgstr "Su versión (conjunto de datos del servidor)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
@@ -3960,7 +3993,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
-msgstr "Pila de Comandos"
+msgstr "Pila de comandos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -3969,6 +4002,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3979,5 +4012,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3986,10 +4019,29 @@
 msgstr "Intercambiar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Pila de comandos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Conflicto"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Combinar conflictos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Resolver"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Abrir una ventana de diálogo de unión para todos los elementos seleccionados "
+"en la lista superior."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3998,28 +4050,4 @@
 msgstr ""
 "Selecciona en el mapa los elementos seleccionados en la lista superior."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Resolver"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Abrir una ventana de diálogo de unión para todos los elementos seleccionados "
-"en la lista superior."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Conflicto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Combinar conflictos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Conflictos: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -4056,46 +4084,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "clique Recargar para refrescar la lista"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historial"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Mostrar el historial de todos los elementos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objeto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Fecha"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr ""
 "Recarge todos los objetos actualmente seleccionados y refresque la lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Revertir"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Revertir el estado de todos los objetos actualmente seleccionados a la "
-"versión escogida de la lista del historial"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "No implementado aún."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4230,4 +4261,18 @@
 msgid "Add Properties"
 msgstr "Añadir propiedades"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Añadir"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4294,5 +4339,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
 msgid "Current Selection"
-msgstr "Selección Actual"
+msgstr "Selección actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
@@ -4340,9 +4385,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Desacoplar el panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4351,5 +4396,5 @@
 "herramientas de la izquierda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Haga click para minimizar/maximizar el contenido del panel"
@@ -4379,179 +4424,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Aplicar cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Básico"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Ocupado por"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "enlazado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Etiquetas (un valor nulo borra la etiqueta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Mover hacia arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Mover los miembro(s) seleccionos hacia arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Añadir seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Añadir todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Eliminar seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Eliminar todos los objetos seleccionados de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Deporte"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Borrar la fuente seleccionada de la lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Mueve hacia abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Mover los miembros seleccionados hacia abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
-msgstr "Quitar el miembro en la fila de tabla actual de esta relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+msgstr "Eliminar el miembro en la fila de tabla actual de esta relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas las vías y nodos incompletos de esta relación"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "sí"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "no"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Miembros: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editor de relación: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Existieron conflictos durante la importación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Error analizando la respuesta del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "No se puede conectar con el servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4586,21 +4554,21 @@
 msgstr "Seleccione un marcador primero."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "latitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "longitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "latitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "longitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4609,5 +4577,5 @@
 "URL de www.openstreetmap.org (puede pegar aquí una URL para bajar dicha área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Cuadro delimitador"
@@ -4760,693 +4728,41 @@
 msgstr "Números de teselas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Imágenes para {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Leer gpx"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "No hay hora para el punto {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr ""
-"No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Leyendo {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Imagenes Geoetiquetadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Iniciar GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Finalizar GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "delta actual: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "diferencia de zona horaria: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "imagen"
-msgstr[1] "imagenes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} dentro de la traza."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Sincronizar reloj"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "Imágenes JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Imagen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Zona horaria del GPS (diferencia con la foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizar hora con la del receptor GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "La hora no pudo ser analizada sintácticamente."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "punto GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Personalice el dibujo de línea"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Usar las preferencias globales"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Seleccione las opciones de dibujo de línea"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Personalizar colores"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "Aceptar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Seleccionar una color"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Marcadores desde puntos nombrados"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Puntos de traza nombrados desde {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importar audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "archivos Wave Audio (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcadores de audio desde {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importar imágenes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} traza, "
-msgstr[1] "{0} trazas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} ruta, "
-msgstr[1] "{0} rutas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} nodo de vía"
-msgstr[1] "{0} nodos de vía"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Nombre: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Descripción: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Rango de tiempo "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Longitud: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Convertir en capa de datos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>La subida de datos gps sin procesar como datos de mapa se considera "
-"peligroso.<br>Si quiere subir trazas, consulte aquí:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces (EN)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Convertido desde: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-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:721
-msgid "Download everything within:"
-msgstr "Descargar todo entre:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metros"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Área máxima por petición:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km2"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Esta acción requiere {0} peticiones<br>individuales de descarga."
-"<br¿Desea continuar?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Algunos puntos de interés con marcas temporales anteriores al inicio de la "
-"traza o posterior a su finalización fueron omitidos o trasladados al "
-"comienzo."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Algunos nodos de vía que estaban demasiado lejos de la traza para que sus "
-"tiempos fueran razonablemente estimados se han omitido."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "fuera del área descargada"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "versión {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "Existió {0} conflictos durante la importación."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} formado por:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} borrados.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "sin ajustar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "Versión del API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Convertir a capa de gpx"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "pista"
-msgstr[1] "pistas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punto"
-msgstr[1] "puntos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "una traza con {0} punto"
-msgstr[1] "una traza con {0} puntos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} formado por la traza {1}"
-msgstr[1] "{0} formado por las trazas {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punto"
-msgstr[1] "{0} puntos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "Marcador gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "marcador"
-msgstr[1] "marcadores"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} consiste en el marcador {1}"
-msgstr[1] "{0} consiste en los marcadores {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Sincronizar audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-"Necesita pausar el audio en el momento que oiga su entrada de sincronización"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Audio sincronizado en el punto {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-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:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"Necesitaba haber pausado el audio en el punto de la pista donde quería el "
-"marcador."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "No existen marcadores de audio en esta capa desde los que desplazar."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"Tiene que desplazar el cursor de reproducción cerca de la traza GPX cuya "
-"pista de sonido estaba reproduciendo (rebasado el primer marcador)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Necesita desplazar, mientras pulsa mayúsculas, la cabecera de escucha a un "
-"marcador de audio o a un punto de traza, en donde quiera sincronizar."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "No se ha podido crear un marcador de audio nuevo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Ha habido un error cuando se intentaba mostrar la URL de este marcador"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(La URL era: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Error mostrando la URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Preferencias avanzadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr ""
-"Establecer valores de preferencias manualmente. ¡Utilícelo con precaución!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Buscar: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "El valor actual es el de por defecto"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "El valor por defecto es ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Actualmente el valor por defecto es desconocido (la preferencia no se ha "
-"usado todavía)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Por favor, seleccione la fila a editar"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Nuevo valor de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Por favor, seleccione la fila a borrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Introduzca un par parámetro/valor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Mostrar el menú audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Etiquetar marcadores de audio (imágenes y web)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Mostrar traza de audio en vivo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Crear marcadores no de audio al leer gpx"
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Nodos de vía explícitos con marcas de tiempo válidas"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-"Nodos de vía explícitos con el tiempo estimado desde la posición de la traza"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Puntos de traza nombrados"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Modificado el registro temporal de los archivos de audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Salida de traza (siempre hará esto si no hay otros marcadores disponibles)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-"Mostrar u ocultar la entrada del menú audio de la barra de menú principal."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Mostrar un icono en movimiento representando el punto en la traza "
-"sincronizada donde el audio que se escucha fue grabado."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Poner etiquetas contra marcadores de audio (imagen y web) así como sus "
-"iconos de botón"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Crear capa de marcadores automáticamente desde los nodos de vía al abrir una "
-"capa gpx."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Al importar audio, crear marcadores desde..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Al importar audio, aplicar a cualquier nodo de vía en la capa gpx."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Crear marcadores de audio automaticamnete desde los nodos de traza (en vez "
-"de desde los nodos de vía explícitos) con nombres y descripciones."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Crear marcadores de audio en la posición de la pista correspondiente a la "
-"fecha modificada de cada archivo importado de audio WAV."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"El número de segundos que se salta hacia delante o hacia atrás cuando el "
-"botón pertinente es pulsado."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Avanzar/retroceder tiempo (segundos)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-"La cantidad por la que es multiplicada la velocidad para el avance rápido"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Multiplicador de avance rápido"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Reproducir comenzando este numero de segundos despues (o antes si es "
-"negativo) la pista de audio solicitada"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Tiempo introductorio (segundos)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-"La relación del tiempo transcurrido en la grabadora y el tiempo transcurrido "
-"en realidad."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Calibración grabador de voz"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Color"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6156,5 +5472,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6305,40 +5622,754 @@
 msgstr "Nombre"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Imágenes para {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Leer gpx"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "No hay hora para el punto {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr ""
+"No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Leyendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Imagenes Geoetiquetadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Iniciar GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Finalizar GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "delta actual: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "diferencia de zona horaria: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imagen"
+msgstr[1] "imagenes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} dentro de la traza."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Sincronizar reloj"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "Imágenes JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Imagen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Zona horaria del GPS (diferencia con la foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizar hora con la del receptor GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "La hora no pudo ser analizada sintácticamente."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "punto GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Personalice el dibujo de línea"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Usar las preferencias globales"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Seleccione las opciones de dibujo de línea"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Personalizar colores"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "Aceptar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Seleccionar una color"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Marcadores desde puntos nombrados"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Puntos de traza nombrados desde {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importar audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "archivos Wave Audio (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcadores de audio desde {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importar imágenes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} traza, "
+msgstr[1] "{0} trazas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} ruta, "
+msgstr[1] "{0} rutas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} nodo de vía"
+msgstr[1] "{0} nodos de vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Nombre: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Descripción: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Rango de tiempo "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Longitud: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Convertir en capa de datos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>La subida de datos gps sin procesar como datos de mapa se considera "
+"peligroso.<br>Si quiere subir trazas, consulte aquí:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces (EN)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Convertido desde: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+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:712
+msgid "Download everything within:"
+msgstr "Descargar todo entre:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metros"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Área máxima por petición:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km2"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Esta acción requiere {0} peticiones<br>individuales de descarga."
+"<br¿Desea continuar?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Algunos puntos de interés con marcas temporales anteriores al inicio de la "
+"traza o posterior a su finalización fueron omitidos o trasladados al "
+"comienzo."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Algunos nodos de vía que estaban demasiado lejos de la traza para que sus "
+"tiempos fueran razonablemente estimados se han omitido."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Capa de datos {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "fuera del área descargada"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "versión {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Existió {0} conflictos durante la importación."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} formado por:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} borrados.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "sin ajustar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "Versión del API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Convertir a capa de gpx"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "pista"
+msgstr[1] "pistas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punto"
+msgstr[1] "puntos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "una traza con {0} punto"
+msgstr[1] "una traza con {0} puntos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} formado por la traza {1}"
+msgstr[1] "{0} formado por las trazas {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punto"
+msgstr[1] "{0} puntos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "Marcador gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "marcador"
+msgstr[1] "marcadores"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} consiste en el marcador {1}"
+msgstr[1] "{0} consiste en los marcadores {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Sincronizar audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+"Necesita pausar el audio en el momento que oiga su entrada de sincronización"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Audio sincronizado en el punto {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+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:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Necesitaba haber pausado el audio en el punto de la pista donde quería el "
+"marcador."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "No existen marcadores de audio en esta capa desde los que desplazar."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Tiene que desplazar el cursor de reproducción cerca de la traza GPX cuya "
+"pista de sonido estaba reproduciendo (rebasado el primer marcador)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Necesita desplazar, mientras pulsa mayúsculas, la cabecera de escucha a un "
+"marcador de audio o a un punto de traza, en donde quiera sincronizar."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "No se ha podido crear un marcador de audio nuevo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Ha habido un error cuando se intentaba mostrar la URL de este marcador"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(La URL era: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Error mostrando la URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Preferencias avanzadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+"Establecer valores de preferencias manualmente. ¡Utilícelo con precaución!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Buscar: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "El valor actual es el de por defecto"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "El valor por defecto es ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Actualmente el valor por defecto es desconocido (la preferencia no se ha "
+"usado todavía)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Por favor, seleccione la fila a editar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Nuevo valor de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Por favor, seleccione la fila a borrar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Introduzca un par parámetro/valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Mostrar el menú audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Etiquetar marcadores de audio (imágenes y web)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Mostrar traza de audio en vivo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Crear marcadores no de audio al leer gpx"
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Nodos de vía explícitos con marcas de tiempo válidas"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+"Nodos de vía explícitos con el tiempo estimado desde la posición de la traza"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Puntos de traza nombrados"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Modificado el registro temporal de los archivos de audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+"Salida de traza (siempre hará esto si no hay otros marcadores disponibles)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+"Mostrar u ocultar la entrada del menú audio de la barra de menú principal."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Mostrar un icono en movimiento representando el punto en la traza "
+"sincronizada donde el audio que se escucha fue grabado."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Poner etiquetas contra marcadores de audio (imagen y web) así como sus "
+"iconos de botón"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Crear capa de marcadores automáticamente desde los nodos de vía al abrir una "
+"capa gpx."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Al importar audio, crear marcadores desde..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "Al importar audio, aplicar a cualquier nodo de vía en la capa gpx."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Crear marcadores de audio automaticamnete desde los nodos de traza (en vez "
+"de desde los nodos de vía explícitos) con nombres y descripciones."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Crear marcadores de audio en la posición de la pista correspondiente a la "
+"fecha modificada de cada archivo importado de audio WAV."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"El número de segundos que se salta hacia delante o hacia atrás cuando el "
+"botón pertinente es pulsado."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Avanzar/retroceder tiempo (segundos)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+"La cantidad por la que es multiplicada la velocidad para el avance rápido"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Multiplicador de avance rápido"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Reproducir comenzando este numero de segundos despues (o antes si es "
+"negativo) la pista de audio solicitada"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Tiempo introductorio (segundos)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+"La relación del tiempo transcurrido en la grabadora y el tiempo transcurrido "
+"en realidad."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Calibración grabador de voz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Color"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Estilo de representación {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Capa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Seleccionar un color para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Establecer como predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Establecer todo como predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Colores usados por diferentes objetos en JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6347,25 +6378,25 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Archivos locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Ninguno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forzar lineas si no hay segmentos importados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Dibujar más grandes los puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidad (rojo=lento, verde=rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -6373,5 +6404,5 @@
 "disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color único (puede ser personalizado desde las capas nombradas)"
@@ -6379,5 +6410,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6398,5 +6429,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6434,5 +6465,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6445,50 +6476,50 @@
 msgstr "Pie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Dibujar las flechas de dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Visualización rápida (poco vistosa)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Solo en la cabecera de la vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Dibujar los números de orden de los segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibujar los límites de los datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Dibujar nodos virtuales en el modo selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Dibujar las capas inactivas en otro color"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Suavizar los gráficos del mapa (antialias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Dibujar líneas entre puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6498,9 +6529,9 @@
 "Valor '-1' para dibujar todas las líneas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Longitud máxima de los archivos locales (en metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6509,10 +6540,10 @@
 "dibujarlas todas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Longitud máxima (en metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6521,10 +6552,10 @@
 "información de la línea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6533,5 +6564,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6540,13 +6571,13 @@
 "No dibujar flechas si no están por lo menos a esta distancia de la anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima en píxeles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "dibuje grandes los puntos gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6556,9 +6587,9 @@
 "personalizado en el Gestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Colores de puntos y segmentos de trazas según velocidades."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6568,5 +6599,5 @@
 "(HPOP). Se requiere que su dispositivo de captura registre esa información."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -6574,23 +6605,23 @@
 "medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Coloreado de traza y punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Dibujar pistas de dirección para los segmentos de vía"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Dibujar los números de orden de todos los segmentos de una vía"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -6599,10 +6630,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dibujar los límites de los datos descargados del servidor"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6611,99 +6642,120 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dibujar las capas inactivas en un color diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "Datos OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Conservar archivos de copia de seguridad"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Al guardar, conserve los archivos de backup que terminen en ~"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Mostrar pantalla de bienvenida al inicio"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Mostrar el ID del objeto en las listas de selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Dibujar línea de ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Trabajando sin modo (estilo Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "No requiere cambiar de modos (flujo de trabajo estilo Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Visualización y comportamiento"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Por defecto (determinado automáticamente)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Activar los valores por defecto internos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Activar los valores por defecto internos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Tipo de pista de esquí"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Configurar los complementos disponibles."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Descargar lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Configurar sitios ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Por favor seleccione una entrada."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Configurar los sitios de complementos"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Opciones de visualización"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6711,81 +6763,81 @@
 msgstr "Varios ajustes que manejan la presentación visual del programa."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Ajustes de la conexión"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Configuración del servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Ajustes del mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Ajustes para la proyección del mapa y la interpretación de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Configuración de audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Configuración del audio player y de los marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Debes reiniciar JOSM para que las preferencias tengan efecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Visualizar las coordenadas como"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Método de proyección"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Proyección del mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Método de proyección"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Visualizar las coordenadas como"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Habilitar servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Preferencias del proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Servidor proxy del host"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Puerto del servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Usuario del servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Contraseña del servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "La URL base del servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6794,17 +6846,17 @@
 "clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "URL base del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr "Nombre de usuario OSM (correo-e)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "Contraseña OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6819,78 +6871,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Preferencias de atajos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Cambiando los atajos de teclado manualmente"
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Acción"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Atajo de teclado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Descripción: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Capa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Autores: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Ayuda: : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versión {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Copiar por defecto"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Por favor, seleccione una fila para copiar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Agregar nueva fuente a la lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Borrar la fuente seleccionada de la lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Ordenar menú de preajustes"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Activar los valores por defecto internos"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Fuente de etiquetas preestablecidas"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Las fuentes (URL o nombres de archivo) de los archivos de parametrización "
-"preestablecida. Ver http://josm.openstreetmap.de/wiki/TaggingPresets (EN) "
-"para ver ayuda."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Añadir nueva fuente de etiquetas preestablecidas a la lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Borrar la fuente seleccionada de la lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Etiquetas preestablecidas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Fuentes de etiquetas preestablecidas"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Separador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Personalización de la barra de herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Personalización de los elementos de la barra de herramientas"
@@ -7166,6 +7248,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7174,7 +7256,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "El archivo {0} existe. ¿Sobrescribir?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7499,5 +7581,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7505,17 +7587,17 @@
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-msgstr "{0}% ({1}/{2}), Faltan {3}. Actualizando {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+msgstr "{0}% ({1}/{2}), faltan {3}. Actualizando {4}: {5} (id: {6})"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Actualizar complementos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Descarga de complementos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7528,5 +7610,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7536,23 +7618,23 @@
 "Complementos {0} descargados correctamente. Por favor, reinicie JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Descargando complemento {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
 msgid "Skip download"
 msgstr "Saltar descarga"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "Versión de JOSM {0} requerida para el complemento {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Download Plugin"
 msgstr "Descargar complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr "Salta la descargar"
@@ -7604,6 +7686,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Deshabilitar complemento"
@@ -7619,5 +7701,5 @@
 msgstr "Mantener componente"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7627,5 +7709,5 @@
 "permiso para escribir sobre los existentes"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7635,10 +7717,10 @@
 "\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "De acuerdo a la información del componente, el autor es {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7647,9 +7729,9 @@
 "informar del error."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "¿Se debe deshabilitar el complemento?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7659,5 +7741,5 @@
 "JOSM para descargarle del programa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7667,19 +7749,19 @@
 "administradores de JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Información"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "no hay descripción disponible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "Más detalles"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7688,13 +7770,13 @@
 msgstr[1] "Información del complemento descargada de {0} sitios"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "No se ha encontrado información del complemento."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Todos los complementos instalados están actualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7707,9 +7789,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Descargar los complementos que faltan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7722,6 +7804,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7744,14 +7826,14 @@
 msgstr "desconocido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versión {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Complemento incluido en JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -8013,45 +8095,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrayendo localizaciones GPS del EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Iniciando escaneo del directorio"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "¡¡Uno de los archivos seleccionados era nulo!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Leyendo fotos..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Imposible obtener ruta apropiada para el directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Escaneando directorio {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Encontrado archivo nulo en el directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Correlacionar con GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8265,20 +8347,20 @@
 msgstr "Segundos: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Ajustadas al track GPS {0} de {1} fotografías"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Diferencia horaria de {0} días)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Diferencia temporal entre la traza y las fotografías: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8286,13 +8368,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Ajuste de fotografías a traza fallido"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Ajustar zona horaria y la diferencia temporal"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Valores por defecto"
@@ -8314,5 +8396,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Error al leer el archivo"
@@ -8679,5 +8761,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Capa en blanco"
@@ -8785,17 +8867,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Error en el formato del archivo"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "Éxito en la importación NMEA"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "¡Fallo en la importación NMEA!"
+msgid "TCX Files (*.tcx)"
+msgstr "Archivos GPX (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8820,5 +8904,5 @@
 msgstr "Crear un duplicado de la vía"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Capa para la edición de trazas GPX"
@@ -8839,11 +8923,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Importar camino de capa gpx"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Soltar camino existente"
@@ -8852,6 +8936,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "No se encontró la capa de datos GPX"
@@ -8914,6 +8998,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Actualizar"
@@ -9222,7 +9306,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "lámina de agua"
@@ -9569,14 +9653,14 @@
 "cadena"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Abrir OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Abrir la ventana de OpenStreetBug y activar la descarga automática"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9712,19 +9796,19 @@
 msgstr "Acciones permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detalles requeridos: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "¿Desea permitir esto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9848,7 +9932,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Subiendo..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -10043,13 +10126,4 @@
 "Primero debe especificar las fuentes de las etiquetas preestablecidas en las "
 "preferencias."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importar archivo TCX"
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importar archivo TCX como traza GPS"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10267,34 +10341,34 @@
 "especifica"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Introduzca Lat/Lon para ir a la posición."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "También puedes pegar una dirección URL de www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoom (en metros)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Ir allí"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Salta a la posición"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 "Imposible analizar la Longitud, Latitud y Zoom. Por favor, verifíquelo."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Imposible analizar sintácticamente Lon/Lat"
@@ -10451,5 +10525,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101
 msgid "Validate either current selection or complete dataset."
-msgstr "Validar la selección actual o bien los todos los datos."
+msgstr "Validar la selección actual o el conjunto de datos completado"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
@@ -10515,5 +10589,5 @@
 "layer, but are not connected by a node."
 msgstr ""
-"Este test comprueba si dos carreteras, vías de tren o vías acuáticas se "
+"Este test comprueba si dos carreteras, vías de tren o vías fluiviales se "
 "cruzan al mismo nivel, sin estar conectadas por algún nodo."
 
@@ -10617,9 +10691,9 @@
 "escrito mal."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Comprobación de propiedades:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
@@ -10627,15 +10701,15 @@
 "valores."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Línea de test de etiquetas no válida - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Línea de correción ortográfica no válida: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10646,5 +10720,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Combinaciones incorrectas de etiquetas y/o valores"
@@ -10652,61 +10726,61 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Problema al dibujar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Clave ''{0}'' no válida."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Etiquetas con valores vacíos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Clave de propiedad no válida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Espacio en blanco no válido en la clave de propiedad"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 "Los valores de la propiedad empiezan y terminan con un espacio en blanco"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Los valores de propiedad contienen entidad de HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "La clave ''{0}' no existe en los predefinidos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Los predefinidos no contienen la clave de propiedad"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "El valor \"{0}\" para la clave \"{1}\" no está en los predefinidos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Los predefinidos no contiene valores apropiados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Comprobar las propiedades de las claves"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -10714,19 +10788,19 @@
 "comprobación de las palabras."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Usar analizador de propiedad compleja."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr "Validar valores de propiedad y etiquetas que usan reglas complejas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Fuente de test de etiquetas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10737,21 +10811,21 @@
 "del corrector de etiquetas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Agregar nueva fuente a la lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Editar la fuente seleccionada."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Fuentes de datos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Analizar propiedades de los valores."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -10759,54 +10833,64 @@
 "los predefinidos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Comprobar FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Buscar nodos o viales con FIXME en cualquier propiedad de valor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Compruebar el registro de notas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Analizar si el mapa creado contiene errores en los datos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Usar datos de archivo por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Usar datos de archivo por defecto (recomendado)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Usar datos de archivo por defecto."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Usar datos de archivo por defecto (recomendado)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Utilizar el corrector ortográfico por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Utilizar el corrector ortográfico por defecto (recomendado)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Fijar las propiedades"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "No se pudo encontrar el tipo de elemento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "No se pudo encontrar el nivel de alerta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Expresión ilegal ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10951,7 +11035,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "edificio"
@@ -10965,5 +11049,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "área"
@@ -10973,9 +11057,9 @@
 msgstr "Via sin cerrar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Viales sin conectar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -10983,17 +11067,17 @@
 "vía."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Nodo de extremo de vía próxima a otra carretera"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Nodo de extremo de vía próximo a otro vial"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Nodo de vía próximo a otro vial"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Conectado nodo de extremo de vía próximo a otro vial"
@@ -11017,17 +11101,22 @@
 msgstr "Este test comprueba vías sin etiquetar, vacías y de nodo único."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Vías sin nombre"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Editar una intersección"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Vías sin etiquetar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Vías vacías"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Vías de un solo nodo"
@@ -11040,5 +11129,5 @@
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
-"Este test comprueba la dirección de vías acuáticas, terrestres y de costa."
+"Este test comprueba la dirección de vías fluviales, terrestres y de costa."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
@@ -11069,14 +11158,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr "Extender al final de la línea"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Ocurrió una excepción"
@@ -11128,5 +11217,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
 msgid "Download Rectified Images From Various Services"
-msgstr ""
+msgstr "Descargar imagen rectificada desde varios servicios"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
@@ -11174,5 +11263,5 @@
 msgstr "Ajustar la posición de la capa WMS seleccionada"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11188,15 +11277,15 @@
 msgstr "Descarga automática"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11205,58 +11294,58 @@
 "o cambe la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Descargar las teselas visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Recargar teselas erróneas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Salvar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Cargar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Abrir una capa WMS en blanco para cargar datos desde un archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Preferencias del componente WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
@@ -11267,45 +11356,34 @@
 "para añadirlo a la lista superior de servidores mostrados)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Nombre del menú"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "Dirección URL del servicio WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Nombre del menú (por defecto)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "Dirección URL del servicio WMS (Por defecto)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Introduce un nombre y una dirección para el servicio WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Copiar por defecto"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Por favor, seleccione una fila para copiar"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr "Teselas superpuestas"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% de lat:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% de lon:"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Descargar"
 
 #. *
@@ -11395,5 +11473,5 @@
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Permite importar directamente distintos formatos de archivo en JOSM."
 
 #. Plugin DirectUpload
@@ -11565,16 +11643,11 @@
 "de forma autónoma."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Carga directamente archivos TCX en JOSM"
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11586,5 +11659,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11595,5 +11668,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11605,10 +11678,11 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+"Descargar fácilmente a lo largo de una larga serie de vías interconectadas"
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12273,5 +12347,5 @@
 #: build/trans_presets.java:650 build/trans_presets.java:1282
 msgid "paved"
-msgstr "pavimentado"
+msgstr "pavimentada"
 
 #: build/trans_presets.java:232 build/trans_presets.java:250
@@ -12406,4 +12480,64 @@
 msgid "Access"
 msgstr "Acceso"
+
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "sí"
 
 #. color permissive
@@ -12428,5 +12562,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "privado"
@@ -12474,5 +12608,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "destino"
@@ -12509,5 +12643,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "permisivo"
@@ -12526,4 +12660,28 @@
 msgid "agricultural"
 msgstr "agrícola"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "no"
 
 #: build/trans_presets.java:315
@@ -12739,6 +12897,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "Autopista"
@@ -12764,6 +12922,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "Carretera principal"
@@ -12789,6 +12947,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "vía primaria"
@@ -12814,6 +12972,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "vía secundaria"
@@ -12827,5 +12985,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "carretera local"
@@ -12843,5 +13001,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "calle urbana"
@@ -12859,5 +13017,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "vía de servicio"
@@ -12884,6 +13059,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "en construcción"
@@ -12933,5 +13108,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "rotonda"
@@ -13020,5 +13195,5 @@
 #: build/trans_presets.java:514 build/trans_presets.java:535
 msgid "concrete"
-msgstr "concreto"
+msgstr "hormigón"
 
 #: build/trans_presets.java:514 build/trans_presets.java:556
@@ -13871,5 +14046,5 @@
 #: build/trans_presets.java:1096
 msgid "Riverbank"
-msgstr "Ribera"
+msgstr "Ribera (para orillas de ríos anchos)"
 
 #. item
@@ -13911,5 +14086,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "marísma"
@@ -14034,5 +14209,5 @@
 #: build/trans_presets.java:1175
 msgid "Waterway Point"
-msgstr "Nodo de vía acuática"
+msgstr "Nodo en vía fluvial"
 
 #. group "Waterway Point"
@@ -15640,27 +15815,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "deporte"
@@ -18505,8 +18680,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "bicicleta"
@@ -18575,8 +18750,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "pie"
@@ -18602,5 +18777,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metro"
@@ -18730,4 +18905,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18736,4 +18912,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18742,4 +18919,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18748,4 +18926,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18809,7 +18988,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "puente"
@@ -18867,4 +19046,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18990,7 +19170,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -19073,15 +19253,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "obsoleto"
@@ -19123,5 +19303,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "caballo"
@@ -19331,11 +19511,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "barrera"
@@ -19373,6 +19553,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "calle"
@@ -19428,7 +19608,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "pista"
@@ -19484,8 +19664,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "ferrocarril"
@@ -19506,5 +19686,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "servicios"
@@ -19518,5 +19698,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr "vado"
@@ -19537,5 +19717,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "círculo de giro"
@@ -19550,5 +19730,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr "Punto de acceso de emergencias"
@@ -19563,5 +19743,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "ribera"
@@ -19575,5 +19755,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "arroyo"
@@ -19587,5 +19767,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "muelle"
@@ -19613,5 +19793,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "acueducto"
@@ -19779,13 +19959,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "hecho por el hombre"
@@ -19847,7 +20027,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -19870,10 +20050,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "otros ferrocarriles"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "paso con más de un cruce ferroviario"
@@ -19893,7 +20073,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19901,8 +20084,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "vía muerta"
@@ -19947,6 +20134,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "aerovía"
@@ -19960,5 +20147,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminal"
@@ -19980,5 +20167,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "pista (oscuro)"
@@ -19992,5 +20179,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "pista (claro)"
@@ -20038,7 +20225,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "pista de rodadura"
@@ -20055,5 +20242,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "pista fácil"
@@ -20068,5 +20255,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "pista intermedia"
@@ -20081,5 +20268,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "pista avanzada"
@@ -20094,5 +20281,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "pista para expertos"
@@ -20107,5 +20294,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "pista de estilo libre"
@@ -20120,5 +20307,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "pista para iniciados"
@@ -20223,10 +20410,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "energía"
@@ -20240,5 +20427,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "muelle"
@@ -20252,5 +20439,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "tubería"
@@ -20378,12 +20565,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "ocio"
@@ -20397,5 +20584,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "puerto deportivo"
@@ -20467,8 +20654,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "servicios"
@@ -20570,10 +20757,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "tráfico de ocio"
@@ -20959,22 +21146,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "equipamiento lumínico"
@@ -21006,6 +21193,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "agua (claro)"
@@ -21066,8 +21253,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "salud"
@@ -21420,26 +21607,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "tienda"
@@ -21511,8 +21698,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotel"
@@ -21662,9 +21849,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turismo"
@@ -21736,8 +21923,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -21808,8 +21995,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "zona verde"
@@ -21823,5 +22010,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "cantera"
@@ -21835,5 +22022,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "vertedero"
@@ -21855,5 +22042,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "cuenca"
@@ -21867,5 +22054,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "plantación forestal"
@@ -21879,5 +22066,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -21900,5 +22087,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "venta al por menor"
@@ -21912,5 +22099,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "industrial"
@@ -21924,5 +22111,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -21936,5 +22123,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "área rururbana"
@@ -21948,5 +22135,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -22003,7 +22190,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "zona militar"
@@ -22017,5 +22204,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "cementerio"
@@ -22028,5 +22215,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "pico"
@@ -22041,5 +22228,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "glaciar"
@@ -22053,5 +22240,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "volcán"
@@ -22106,8 +22293,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "espacio natural"
@@ -22121,5 +22308,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "matorral"
@@ -22133,5 +22320,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "monte"
@@ -22145,5 +22332,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "bosque"
@@ -22157,5 +22344,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "lodazal"
@@ -22169,5 +22356,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "playa"
@@ -22245,8 +22432,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "ruta"
@@ -22294,7 +22481,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "frontera"
@@ -22436,10 +22623,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "lugar"
@@ -22487,6 +22674,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "dirección"
@@ -22717,10 +22904,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22728,5 +22915,5 @@
 msgstr "NPE Maps"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22734,107 +22921,146 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Datos OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Vía ciclable"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Calles NRW Geofabrik.de de Renania del Norte-Westfalia"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr "Terraserver Topo"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr "Terraserver Urban"
 
+#~ msgid "Data Layer"
+#~ msgstr "Capa de datos"
+
+#~ msgid "Change"
+#~ msgstr "Modificar"
+
+#~ msgid "Rotate"
+#~ msgstr "Rotar"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Seleccione al menos un nodo, víaa o relación. Solamente los elementos "
-#~ "previamente enviados tienen historial."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Deshaciendo borrado de vía..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Comprobando si falta el nodo {0}..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Deshaciando borrado de relación..."
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Comprobando si falta el primitivo {0}..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Mantaner lo mío"
-
-#~ msgid "Delete mine"
-#~ msgstr "Borrar lo mío"
+#~ "La proyección {0} se ha diseñado \n"
+#~ "solamente para latitudes entre 46.1° y 57°.\n"
+#~ "Use otro sistema de  proyección si no usa\n"
+#~ "un servidor WMS francés.\n"
+#~ "No suba ningún dato después de este mensaje."
 
 #~ msgid ""
-#~ "<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>"
+#~ "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 ""
-#~ "<html>El primitivo de OSM con ID <strong>{0}</strong> ha sido "
-#~ "borrado<br>en el servidor por otro mapeador.<br><br>Pulse <strong>{1}</"
-#~ "strong> para mantener su primitivo e ignorar el estado de borrado.<br>Se "
-#~ "asignará una nueva ID a su primitivo.<br>Pulse <strong>{2}</strong> para "
-#~ "aceptar el estado en el servidor y borrar su primitivo.<br>Pulse <strong>"
-#~ "{3}</strong> para cancelar.<br>"
+#~ "La proyección \"{0}\" está diseñada únicamente\n"
+#~ "para latitudes entre 45.7° y 47.9°\n"
+#~ "y longitudes entre 5.7° y 10.6°.\n"
+#~ "Use otro sistema de proyección si no está trabajando\n"
+#~ "con un conjunto de datos relativos a Suiza o Liechtenstein.\n"
+#~ "No suba ningún dato tras haber leido este mensaje."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Conflictos: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Fuente de etiquetas preestablecidas"
 
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "<html>Hay  <strong>{0}</strong> primitivos <br>seleccionados para "
-#~ "actualización individual. Por favor, reduzca la selección<br>a un máximo "
-#~ "de {1} primitivos.</html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Selección demasiado grande"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Imagen con la ruta {0} no existe o no puede ser leida."
+#~ "Las fuentes (URL o nombres de archivo) de los archivos de parametrización "
+#~ "preestablecida. Ver http://josm.openstreetmap.de/wiki/TaggingPresets (EN) "
+#~ "para ver ayuda."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Añadir nueva fuente de etiquetas preestablecidas a la lista."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Fuentes de etiquetas preestablecidas"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importar archivo TCX"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importar archivo TCX como traza GPS"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Teselas superpuestas"
+
+#~ msgid "% of lat:"
+#~ msgstr "% de lat:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% de lon:"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Carga directamente archivos TCX en JOSM"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Subiendo datos"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "No implementado aún."
+
 #~ msgid "Email"
 #~ msgstr "Correo Electrónico"
@@ -22842,4 +23068,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Resolver conflictos"
+
+#~ msgid "Object"
+#~ msgstr "Objeto"
 
 #~ msgid "{0} object has conflicts:"
@@ -22880,4 +23109,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Resolver conflictos {0} en objetos {1}"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "clique Recargar para refrescar la lista"
+
+#~ msgid "Revert"
+#~ msgstr "Revertir"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Revertir el estado de todos los objetos actualmente seleccionados a la "
+#~ "versión escogida de la lista del historial"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -23065,4 +23310,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Seleccione al menos un nodo, víaa o relación. Solamente los elementos "
+#~ "previamente enviados tienen historial."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -23119,2 +23371,50 @@
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "La subida de datos ha fallado por una razón desconocida"
+
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "Imagen con la ruta {0} no existe o no puede ser leida."
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "Deshaciendo borrado de vía..."
+
+#~ msgid "Checking whether node {0} is gone ..."
+#~ msgstr "Comprobando si falta el nodo {0}..."
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "Deshaciando borrado de relación..."
+
+#~ msgid "Checking whether primitive {0} is gone ..."
+#~ msgstr "Comprobando si falta el primitivo {0}..."
+
+#~ msgid "Keep mine"
+#~ msgstr "Mantaner lo mío"
+
+#~ msgid "Delete mine"
+#~ msgstr "Borrar lo mío"
+
+#~ msgid ""
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
+#~ msgstr ""
+#~ "<html>El primitivo de OSM con ID <strong>{0}</strong> ha sido "
+#~ "borrado<br>en el servidor por otro mapeador.<br><br>Pulse <strong>{1}</"
+#~ "strong> para mantener su primitivo e ignorar el estado de borrado.<br>Se "
+#~ "asignará una nueva ID a su primitivo.<br>Pulse <strong>{2}</strong> para "
+#~ "aceptar el estado en el servidor y borrar su primitivo.<br>Pulse <strong>"
+#~ "{3}</strong> para cancelar.<br>"
+
+#~ msgid ""
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
+#~ msgstr ""
+#~ "<html>Hay  <strong>{0}</strong> primitivos <br>seleccionados para "
+#~ "actualización individual. Por favor, reduzca la selección<br>a un máximo "
+#~ "de {1} primitivos.</html>"
+
+#~ msgid "Selection too big"
+#~ msgstr "Selección demasiado grande"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 16400)
+++ applications/editors/josm/i18n/po/et.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-07 16:39+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-06 19:13+0000\n"
 "Last-Translator: Margus Värton <margus@dakar.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,31 @@
 msgstr "Abi"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr "Projektsiooni ei saanud eelistusest lugeda. Kasutan Mercatori"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Salvestamata muudatused"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "On salvestamata muudatusi. Tühista muudatused ja jätka?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Salvesta ja välju"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Tühista ja välju"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +69,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +88,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +99,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoreerin vigast URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoreerin vigast faili URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "TUNDMATU"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Näita info akent."
@@ -131,10 +132,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,27 +143,28 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versioon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Viimane muudatus {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java versioon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Koduleht"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
-msgstr "Vigadest Teatamine"
+msgstr "Vigadest teatamine"
 
 #. <button label="Camping" hotkey="Z" icon="caravan">
@@ -170,5 +172,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +178,27 @@
 msgstr "Teave"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Loemind"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revisjon"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Panus"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Pistikud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "JOSM -i kohta ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Faili ei leitud"
@@ -210,14 +212,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Palun vali vähemalt üks sõlm või tee."
+msgstr "Palun vali vähemalt üks juba üles laetud sõl, tee või relatsioon."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
-msgstr ""
+msgstr "Hoiatus"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69
@@ -270,5 +271,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Laiuskraad"
@@ -277,5 +278,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Pikkuskraad"
@@ -283,5 +284,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Paiguta sõlmed ringikujuliselt."
@@ -294,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -359,9 +360,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
 msgid "API initialization failed"
-msgstr ""
+msgstr "API initsialiseerimine ebaõnnestus"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -380,7 +381,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Konfliktne relatsioon"
+msgstr "Eeltingimuste rikkumine"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -389,37 +389,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "kiht"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "allalaetule"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Suumi {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Suumi vaade {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -429,9 +429,9 @@
 msgstr "Vaade: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Ei ole valitud midagi, millele suumida"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Ei ole vastuolusid, millele suumida"
@@ -522,37 +522,41 @@
 msgstr "Palun vali kopeerimiseks mõni objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Moodusta ring"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Moodusta valitud kolmest sõlmest ring."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Palun vali täpselt kolm sõlme või tee täpselt kolme sõlmega."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Need sõlmed ei ole ringis."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Palun vali täpselt kolm sõlme või tee täpselt kolme sõlmega."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Kustuta"
@@ -602,5 +606,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -671,5 +675,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
 msgid "E-Mail"
-msgstr ""
+msgstr "E-post"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
@@ -707,11 +711,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -722,5 +727,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Viga"
@@ -730,30 +735,30 @@
 msgstr "Vali eeldefineeritud litsents"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM võrguabi"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Ava sirvikus"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Muuda"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -761,19 +766,19 @@
 msgstr "Lae uuesti"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Viga lehekülje {0} laadimisel."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -788,18 +793,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Näita OSM sõlmede ja teede ajalugu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Elemendi ajalugu."
+msgstr "Info elemendi kohta"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Näita OSM sõlmede ja teede ajalugu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -858,5 +860,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Peegelda"
@@ -895,10 +897,10 @@
 msgstr "Paremale"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Liiguta {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -906,5 +908,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Objekte ei saa maailmast välja viia"
@@ -1098,5 +1100,5 @@
 msgstr "Fail {0} on juba olemas. Kas kirjutan üle?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1106,26 +1108,25 @@
 "sellest veast arendajaid."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Tühi dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dokumendis ei ole andmeid."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Salvesta ikkagi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konfliktid"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1135,36 +1136,36 @@
 "tagasi. Jätkame?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Lahenda vastuolud ja salvesta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Salvesta OSM fail."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Salvesta GPX fail"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Salvesta kiht"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Ei saa faili varundada."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Tundmatu faililaiend."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Salvestamisel ilmnes viga."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Varundatud faili taastamisel ilmnes viga"
@@ -1214,6 +1215,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Sulge"
@@ -1284,11 +1286,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Rollipõhised seosed kopeeriti uutele teedele.\n"
-"Vaata need igaks juhuks üle."
+"Relatsiooni liikmelisus kopeeriti kõikidele uutele teedele.\n"
+"Seda tuleb kontrollida ning vajadused viia sisse parandused."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1439,5 +1440,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
 msgid "Failed to update the selected primitives."
-msgstr ""
+msgstr "Valitud primitiivide uuendamine ebaõnnestus."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
@@ -1452,10 +1453,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
 msgid "Missing primitive"
-msgstr ""
+msgstr "Puuduv primitiiv"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
 msgid "Update Selection"
-msgstr ""
+msgstr "Uuenda valik"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
@@ -1465,74 +1466,74 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
 msgid "There are no selected primitives to update."
-msgstr ""
+msgstr "Ei ole valitud primitiive mida uuendada."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "Selection empty"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+msgstr "Tühi valik"
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Lae OSMi serverisse"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Lae kõik muudatused OSM serverisse üles."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Objektid lisada:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Objektid muuta:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Objektid kustutada:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Kas laen need muudatused üles?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Lae muudatused üles"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Midagi pole üles laadida. Hangi esmalt andmeid."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Lahendamata konfliktid! Sa pead need enne lahendama."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Pole muudatusi mida üles laadida."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+msgstr "Üleslaadimine"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+msgstr "Primitiivi uuendamine"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1546,17 +1547,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
-msgstr ""
+msgstr "Avastatud konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1567,10 +1568,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1580,9 +1581,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+msgstr "Eelitingimuste rikkumine"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1592,18 +1593,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+msgstr "Primitiiv on juba kustutatud"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+msgstr "Laadimine OSM API-le ebaõnnestus"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1708,25 +1709,16 @@
 msgstr "Toored GPS andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Andmete allalaadimine"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Andmeid ei imporditud."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Andmekiht {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Openstreetmapi andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Andmekiht"
-
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
 #, java-format
@@ -1736,5 +1728,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
 msgid "The following errors occurred during mass download:"
-msgstr ""
+msgstr "Massilisel allalaadimisel leidsid aset järgmised vead:"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
@@ -1754,5 +1746,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
 msgid "Deleted or moved primitives"
-msgstr ""
+msgstr "Kustutatud või nihutatud primitiivid"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1767,5 +1759,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1836,6 +1828,6 @@
 msgid "Insert new node into way."
 msgid_plural "Insert new node into {0} ways."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lisa teele uus sõlm."
+msgstr[1] "Lisa {0} teele uus sõlm."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
@@ -1866,5 +1858,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -1875,5 +1867,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -1889,7 +1881,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1897,9 +1889,9 @@
 msgstr "Vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1908,10 +1900,33 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Liigu vasakule"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Liigu vasakule"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Võta tagasi"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1928,5 +1943,5 @@
 msgstr "Suumi ja liiguta kaarti"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2184,35 +2199,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Lisa"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Muuda"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Kustuta {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Muuda {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2222,19 +2229,26 @@
 msgstr[1] "objektid"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2242,25 +2256,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Kustuta {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Kustuta {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Konfliktne relatsioon"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2269,11 +2283,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2282,10 +2296,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr ""
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2294,20 +2308,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Liiguta"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2333,43 +2347,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
+#, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "eemalda valikust"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Rotate {0} {1}"
+msgstr "Kustuta {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Jada"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2465,25 +2485,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr ""
@@ -2494,5 +2540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2517,5 +2563,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2614,17 +2660,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2632,16 +2674,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2653,127 +2684,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgid "No \"from\" way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
-msgid "No \"from\" way found."
+msgid "No \"to\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr ""
@@ -2781,5 +2812,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2807,6 +2838,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "taust"
@@ -2816,19 +2847,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2839,30 +2860,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Liiguta {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2874,14 +2889,14 @@
 msgstr "Ei suutnud salvestada järjehoidjat"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Päeva sõnum pole saadaval"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Laen alla \"päeva sõnumit\""
@@ -3072,5 +3087,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3088,5 +3102,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
 msgid "Full Screen"
-msgstr ""
+msgstr "Täisekraan"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
@@ -3132,5 +3146,5 @@
 msgstr "Vähenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr ""
@@ -3164,8 +3178,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "kiht ei ole nimekirjas"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3173,9 +3192,9 @@
 msgstr "Ühendun OSM serveriga"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Viga parsimisel"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr ""
@@ -3235,4 +3254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3242,4 +3262,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3247,5 +3269,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Liikmed"
@@ -3441,7 +3464,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3521,4 +3544,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3526,4 +3552,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3533,4 +3560,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3646,7 +3674,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Palun sisesta koha nimi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3688,7 +3715,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Ei ole shortcuti."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3720,7 +3746,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "eemalda valikust"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3731,9 +3756,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Roll"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3751,4 +3778,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3772,8 +3801,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3784,7 +3813,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3840,5 +3870,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Käsujada"
@@ -3849,6 +3879,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3859,5 +3889,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3866,10 +3896,27 @@
 msgstr "Lülita ümber: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Käsujada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Vastuolu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Ühendan vastuolusid."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Lahenda"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3878,26 +3925,4 @@
 msgstr ""
 "Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Lahenda"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Vastuolu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Ühendan vastuolusid."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konfliktid: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -3934,45 +3959,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Ajalugu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Näita kõigi valitud objektide ajalugu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Kuupäev"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Lae kõik hetkel valitud objektid uuesti ja värskenda nimekirja."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Taasta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-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."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Pole veel teostatud."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4105,4 +4133,18 @@
 msgid "Add Properties"
 msgstr "Lisa seaded"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Lisa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4215,9 +4257,9 @@
 msgstr "Valik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Lase paneel vabaks"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4225,5 +4267,5 @@
 "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu"
@@ -4253,179 +4295,101 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Lihtne"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Kasutab"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Sildid (tühi väärtus kustutab sildi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Liiguta hetkel valitud liiget ülespoole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Lisa valitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Lisa kõik hetkel valitud objektid liikmetena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Eemalda valitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Eemalda kõik hetkel valitud objektid seosest"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+msgid "Sort the selected relation members or the whole list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Liiguta hetkel valitud liiget allapoole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Lae alla liikmed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Liikmed: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Importimisel tekkisid konfliktid."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Viga serveri vastuse töötlemisel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Ei saa serveriga ühenduda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4460,21 +4424,21 @@
 msgstr "Vali enne järjehoidja."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4483,5 +4447,5 @@
 "URL lehelt www.openstreetmap.org (saad kleepida siia allalaetava ala URL''i)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Ümbritsev kast"
@@ -4630,657 +4594,41 @@
 msgstr "Pildi numbrid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "pilt"
-msgstr[1] "pildid"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Sünkroniseeri kell"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Pilt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Kohanda värvi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Vaikimisi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Vali värv"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Heli import"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Piltide import"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Muuda andme kihiks"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html> Töötlemata GPS andmete üleslaadimist kaardi andmetena loetakse "
-"kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Muudetud sellest: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} kustutatud.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punkt"
-msgstr[1] "punktid"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "gps marker"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "marker"
-msgstr[1] "markerid"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} koosneb {1} markerist"
-msgstr[1] "{0} koosneb {1} markerist"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Sünkroniseeri heli"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Heli sünkroniseeritud punktis {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Loo heli marker mängimise alguses"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "Pane heli pausile punktis kuhu sa soovid markerit."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Pole heli markerit millest nihutada."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Pead SHIFT klahvi all hoides lohistama mängimise pea heli markerile või "
-"rajapuhktile kuhu sa soovid sünkroniseerida"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Ei saa uut heli markerit luua."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Tekkis viga kui prooviti kuvada selel markeri URL''i"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL oli: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Viga URL''i kuvamisel"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "PAlun vali rida muutmiseks"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Palun vali rida kustutamiseks"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Värv"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -5990,5 +5338,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6139,40 +5488,718 @@
 msgstr "Nimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "pilt"
+msgstr[1] "pildid"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Sünkroniseeri kell"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Pilt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Kohanda värvi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Vali värv"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Heli import"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Piltide import"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Muuda andme kihiks"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html> Töötlemata GPS andmete üleslaadimist kaardi andmetena loetakse "
+"kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Muudetud sellest: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Andmekiht {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} kustutatud.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punkt"
+msgstr[1] "punktid"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "gps marker"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "marker"
+msgstr[1] "markerid"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} koosneb {1} markerist"
+msgstr[1] "{0} koosneb {1} markerist"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Sünkroniseeri heli"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Heli sünkroniseeritud punktis {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Loo heli marker mängimise alguses"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "Pane heli pausile punktis kuhu sa soovid markerit."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Pole heli markerit millest nihutada."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Pead SHIFT klahvi all hoides lohistama mängimise pea heli markerile või "
+"rajapuhktile kuhu sa soovid sünkroniseerida"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Ei saa uut heli markerit luua."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Tekkis viga kui prooviti kuvada selel markeri URL''i"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL oli: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Viga URL''i kuvamisel"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "PAlun vali rida muutmiseks"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Palun vali rida kustutamiseks"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Värv"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Vali"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Värvid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6181,29 +6208,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -6211,5 +6238,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6230,5 +6257,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6266,5 +6293,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6277,50 +6304,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Joonista suuna nooled"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6328,34 +6355,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6363,13 +6390,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6377,9 +6404,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6387,136 +6414,155 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr ""
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Välimus ja tunnetus"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+msgid "Enable built-in icon defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr ""
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Vaateseadistused"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6524,98 +6570,98 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Ühenduse sätted"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Kaardi seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Muudatuste rakendumiseks pead JOSMi taaskäivitama."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
-msgid "Map Projection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
 msgid "Projection method"
 msgstr "Projektsiooni meetodid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
+msgid "Map Projection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM parool"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6630,75 +6676,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr ""
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Valik: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Kihid: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Autorid: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Abi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versioon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Vaikimisi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Ühenda uus sõlm olemasoleva teega"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr ""
@@ -6948,6 +7027,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -6956,7 +7035,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Fail {0} on juba olemas. Kas kirjutan üle?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7270,5 +7349,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7278,15 +7357,15 @@
 msgstr "{0}% ({1}/{2}), {3} jäänud. Laen üles {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Uuenda pistikuid"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7299,5 +7378,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7306,23 +7385,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7368,6 +7447,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr ""
@@ -7382,5 +7461,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7388,5 +7467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7394,19 +7473,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7414,5 +7493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7420,19 +7499,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "kirjeldust pole saadaval"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7441,13 +7520,13 @@
 msgstr[1] "Laadisin alla pluginate info {0} saidilt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Pluginate infot ei leitud"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Kõik installeeritud pluginad on uuendatud."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7460,9 +7539,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Lae alla puuduvad pluginad"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7475,6 +7554,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7497,14 +7576,14 @@
 msgstr "tundmatu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versioon {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin kaasatud JOSMi"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7753,45 +7832,45 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7990,20 +8069,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8011,13 +8090,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8039,5 +8118,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -8345,6 +8424,6 @@
 msgid "Simplify Way (remove {0} node)"
 msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lihtsusta tee (eemalda {0} sõlm)"
+msgstr[1] "Lihtsusta tee (eemalda {0} sõlme)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
@@ -8371,5 +8450,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr ""
@@ -8472,17 +8551,18 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
-#, fuzzy
 msgid "Format errors: "
-msgstr "Kontrollsumma vead: "
+msgstr ""
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
 msgid "TangoGPS import success"
-msgstr "NMEA import oli edukas."
+msgstr ""
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
 msgid "TangoGPS import faliure!"
-msgstr "NMEA impordi viga!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
+msgid "TCX Files (*.tcx)"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8507,5 +8587,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8526,11 +8606,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8539,6 +8619,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr ""
@@ -8601,6 +8681,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr ""
@@ -8906,7 +8986,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr ""
@@ -9235,14 +9315,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+msgid "Open OpenStreetBugs"
+msgstr ""
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-msgid "Open OpenStreetBugs"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9368,19 +9448,19 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9504,7 +9584,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Üleslaadimine..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9692,13 +9771,4 @@
 #: ../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 ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
 msgstr ""
 
@@ -9908,33 +9978,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -9942,5 +10012,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Simplify Way"
-msgstr ""
+msgstr "Lihtsusta tee"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
@@ -9950,5 +10020,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82
 msgid "Please select at least one way to simplify."
-msgstr ""
+msgstr "Palun vali lihtsustamiseks vähemalt üks tee."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87
@@ -9958,5 +10028,7 @@
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr[0] ""
+"Valik sisaldab {0} teed. Kas oled kindel, et soovid seda lihtsustada?"
 msgstr[1] ""
+"Valik sisaldab {0} teed. Kas oled kindel, et soovid neid lihtsustada?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -10240,23 +10312,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10265,5 +10337,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10271,78 +10343,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10350,74 +10422,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+msgid "Use default tag ignore file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+msgid "Use the default tag ignore file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10562,7 +10642,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr ""
@@ -10576,5 +10656,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr ""
@@ -10584,25 +10664,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10625,17 +10705,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "ühendus"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr ""
@@ -10673,14 +10758,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr ""
@@ -10778,5 +10863,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10789,117 +10874,106 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+msgid "Load WMS layer from file"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "WMS Plugin Preferences"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "WMS Plugin Preferences"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
+msgid "Menu Name"
 msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
-msgid "Menu Name"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+msgid "WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "Menu Name (Default)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "WMS URL (Default)"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
-msgid "WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "Menu Name (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "WMS URL (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Lae alla"
 
 #. *
@@ -11111,16 +11185,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11129,5 +11198,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11136,5 +11205,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11143,10 +11212,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -11943,4 +12012,64 @@
 msgstr ""
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr ""
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -11964,5 +12093,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr ""
@@ -12010,5 +12139,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr ""
@@ -12045,5 +12174,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12061,4 +12190,28 @@
 #: build/trans_presets.java:623
 msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
 msgstr ""
 
@@ -12275,6 +12428,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr ""
@@ -12300,6 +12453,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr ""
@@ -12325,6 +12478,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr ""
@@ -12350,6 +12503,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr ""
@@ -12363,5 +12516,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr ""
@@ -12379,5 +12532,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr ""
@@ -12395,5 +12548,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12420,6 +12590,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr ""
@@ -12469,5 +12639,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr ""
@@ -13446,5 +13616,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr ""
@@ -15175,27 +15345,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr ""
@@ -18033,8 +18203,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "jalgrattaga"
@@ -18103,8 +18273,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "jalgsi"
@@ -18130,5 +18300,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metroo"
@@ -18258,4 +18428,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18264,4 +18435,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18270,4 +18442,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18276,4 +18449,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18337,7 +18511,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "sild"
@@ -18395,4 +18569,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18518,7 +18693,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18601,15 +18776,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "kasutusest väljas"
@@ -18651,5 +18826,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "hobused"
@@ -18859,11 +19034,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -18901,6 +19076,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "tänav"
@@ -18956,7 +19131,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "teerada"
@@ -19012,10 +19187,10 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
-msgstr "ääris"
+msgstr "raudtee"
 
 #. color deprecated
@@ -19034,5 +19209,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19046,5 +19221,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19065,5 +19240,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "tagasipööramisring"
@@ -19078,5 +19253,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19091,5 +19266,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "jõekallas"
@@ -19103,5 +19278,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "oja"
@@ -19115,5 +19290,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "dokk"
@@ -19141,5 +19316,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "akvedukt"
@@ -19307,13 +19482,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "inimtekkeline"
@@ -19375,9 +19550,9 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
-msgstr "raudteevärk"
+msgstr ""
 
 #. color rail
@@ -19398,10 +19573,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "muu rööbastee"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "ülarelss"
@@ -19421,7 +19596,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19429,8 +19607,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "kasutamata raudtee"
@@ -19475,6 +19657,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "aeronautika"
@@ -19488,5 +19670,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "lennuterminal"
@@ -19508,5 +19690,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "helikopterid"
@@ -19520,5 +19702,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "kerglennukid"
@@ -19566,7 +19748,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "trosstransport"
@@ -19583,5 +19765,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "suusanõlv lihtne"
@@ -19596,5 +19778,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "suusanõlv keskmine"
@@ -19609,5 +19791,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "suusanõlv edasijõudnutele"
@@ -19622,5 +19804,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19635,5 +19817,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "suusanõlv klassita"
@@ -19648,5 +19830,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "suusanõlv algajale"
@@ -19751,10 +19933,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "elektrivarustus"
@@ -19768,5 +19950,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "kai"
@@ -19780,5 +19962,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "torujuhe"
@@ -19906,12 +20088,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "puhkealad"
@@ -19925,5 +20107,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "paadisadam"
@@ -19995,8 +20177,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "mugavused"
@@ -20098,10 +20280,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "autohooldus"
@@ -20487,22 +20669,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "muud mugavused"
@@ -20534,6 +20716,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "vesi"
@@ -20594,8 +20776,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "tervishoid"
@@ -20948,26 +21130,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "pood"
@@ -21039,8 +21221,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotell"
@@ -21190,9 +21372,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turism"
@@ -21264,8 +21446,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "alalooline"
@@ -21336,8 +21518,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "roheline"
@@ -21351,5 +21533,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "kivimurd"
@@ -21363,5 +21545,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "prügimägi"
@@ -21383,5 +21565,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "tehisjärv"
@@ -21395,5 +21577,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "kultuurmets"
@@ -21407,5 +21589,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "taluõu"
@@ -21428,5 +21610,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "kaubandus"
@@ -21440,5 +21622,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "tööstus"
@@ -21452,5 +21634,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -21464,5 +21646,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -21476,5 +21658,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -21531,7 +21713,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "militaarala"
@@ -21545,5 +21727,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "kalmistu"
@@ -21556,5 +21738,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "mäetipp"
@@ -21569,5 +21751,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "liustik"
@@ -21581,5 +21763,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "vulkaan"
@@ -21634,8 +21816,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "looduslik"
@@ -21649,5 +21831,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "põõsastik"
@@ -21661,5 +21843,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "nõmm"
@@ -21673,5 +21855,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "mets"
@@ -21685,5 +21867,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "muda"
@@ -21697,5 +21879,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "rand"
@@ -21773,8 +21955,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "teekond"
@@ -21822,7 +22004,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "piir"
@@ -21964,10 +22146,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "koht"
@@ -22015,6 +22197,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "aadress"
@@ -22245,10 +22427,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22256,5 +22438,5 @@
 msgstr "NPE Maps"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22262,48 +22444,136 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Openstreetmapi andmed"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME parandatud)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+msgid "OpenCycleMap"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Tänavad NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
+
+#~ msgid "Data Layer"
+#~ msgstr "Andmekiht"
+
+#~ msgid "Change"
+#~ msgstr "Muuda"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konfliktid: {0}"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME parandatud)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "Uploading data"
+#~ msgstr "Andmete üles laadimine"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Pole veel teostatud."
+
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Lahenda konfliktid"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "my version:"
+#~ msgstr "minu versioon:"
+
+#~ msgid "their version:"
+#~ msgstr "nende versioon:"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM kasutajanimi (email)"
+
+#~ msgid "Unknown host"
+#~ msgstr "Tundmatu host"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada"
+
+#~ 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 "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 ""
+#~ "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 "Could not download plugin: {0} from {1}"
+#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
+
+#~ 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 "The projection could not be read from preferences. Using EPSG:4326"
+#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
 
 #~ msgid ""
@@ -22314,49 +22584,4 @@
 #~ "laetud elementidel on ajalugu."
 
-#~ msgid "Uploading data"
-#~ msgstr "Andmete üles laadimine"
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Lahenda konfliktid"
-
-#~ msgid "my version:"
-#~ msgstr "minu versioon:"
-
-#~ msgid "their version:"
-#~ msgstr "nende versioon:"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM kasutajanimi (email)"
-
-#~ msgid "Unknown host"
-#~ msgstr "Tundmatu host"
-
-#~ 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 ""
-#~ "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 "Could not download plugin: {0} from {1}"
-#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
-
-#~ 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 "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
-
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 16400)
+++ applications/editors/josm/i18n/po/fi.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-26 00:09+0000\n"
-"Last-Translator: Ilari Oras <happo1472583@gmail.com>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-05 23:53+0000\n"
+"Last-Translator: Lauri Kytömaa <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:19+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,31 @@
 msgstr "Ohje"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Tallentamattomia muutoksia"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Tallentamattomia muutoksia. Hylätäänkö muutokset?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Tallenna ja poistu"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Poistu tallentamatta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +69,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +88,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +99,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "TUNTEMATON"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Tietoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Näytä tietoja-ruutu."
@@ -131,10 +132,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,25 +143,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versio {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Edellinen muutos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Javan versio {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Virheilmoitukset"
@@ -170,5 +172,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +178,27 @@
 msgstr "Tietoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Lueminut"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Versio"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Tietoja JOSM:sta..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Tiedostoa ei löytynyt."
@@ -210,12 +212,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Valitse ainakin yksi solmu tai tie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Varoitus"
@@ -270,5 +271,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Leveysaste"
@@ -277,5 +278,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Pituusaste"
@@ -283,5 +284,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Siirrä pisteet ympyrän kehälle"
@@ -294,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -380,7 +381,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Ristiriidassa oleva relaatio"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -389,37 +389,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "taso"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "ristiriita"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "lataa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Sovita näkymä {0}:aan."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Sovita {0} näkymään."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -429,9 +429,9 @@
 msgstr "Näytä: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Ei mitään valittuna"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Ei ristiriitoja"
@@ -523,37 +523,41 @@
 msgstr "Valitse jotain kopioitavaksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Luo ympyrä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Luo ympyrän kolmesta valitusta pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Valitse tasan kolme pistettä tai polku, jossa on tasan kolme pistettä."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Valituista pisteistä ei voi muodostaa ympyrää."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Valitse tasan kolme pistettä tai polku, jossa on tasan kolme pistettä."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Poista"
@@ -603,5 +607,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -710,11 +714,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -725,5 +730,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Virhe"
@@ -733,30 +738,30 @@
 msgstr "Valitse ennaltamääritetty lisenssi"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM-verkko-ohje"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Avaa selaimessa"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -764,19 +769,19 @@
 msgstr "Lataa uudelleen"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Virhe ladattaessa sivua {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -791,18 +796,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Näytä pisteiden tai polkujen historia."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Elementin historia"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Näytä pisteiden tai polkujen historia."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -863,5 +865,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Peilaa"
@@ -900,10 +902,10 @@
 msgstr "oikea"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Siirrä {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -911,5 +913,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Objekteja ei voi siirtää maailman ulkopuolelle"
@@ -1104,5 +1106,5 @@
 msgstr "Tiedosto {0} on jo olemassa. Ylikirjoitetaanko?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1112,26 +1114,25 @@
 "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Tyhjä dokumentti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dokumentti ei sisällä tietoa"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Tallenna silti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1141,36 +1142,36 @@
 "ristiriidoista. Jatka tallennusta?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Hylkää ristiriidat ja tallenna"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Tallenna OSM-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Tallenna GPX-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Tallenna kerros"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Tiedostoa ei voitu varmuuskopioida."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Tuntematon tiedostopääte."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Tallennettaessa tapahtui virhe."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Varmuuskopion palauttamisessa tapahtui virhe."
@@ -1221,6 +1222,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Sulje"
@@ -1292,12 +1294,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Myös polun rooli relaatioissa kopioitiin kaikkiin uusiin polkuihin.\n"
-"Ole hyvä ja tarkista, että jäsenyys ja rooli relaatioissa on oikein, sekä "
-"korjaa tarvittaessa."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1479,69 +1477,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Lähetä OSM-palvelimelle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Lähetä kaikki muutokset OSM-palvelimelle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Lisättävät objektit:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Muokattavat objektit:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Poistettavat objektit:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Lähetetäänkö nämä muutokset?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Lähetä muutokset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Ei mitään lähetettävää. Hae ensin dataa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr ""
 "Selvittämättömiä ristiriitoja. Ne tulee selvittää ennen muutosten lähetystä."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Ei lähetettäviä muutoksia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1555,17 +1553,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1576,10 +1574,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1589,9 +1587,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1601,18 +1599,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1717,24 +1715,15 @@
 msgstr "Raaka GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Ladataan dataa"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Dataa ei tuotu."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datataso {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreeMap-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Datataso"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1776,5 +1765,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1878,5 +1867,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
@@ -1888,5 +1877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi."
@@ -1902,7 +1891,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1910,9 +1899,9 @@
 msgstr "Valitse"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Valitse, siirrä ja pyöritä objekteja"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1921,10 +1910,33 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Siirrä vasemmalle"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Siirrä vasemmalle"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Kumoa"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1941,5 +1953,5 @@
 msgstr "Zoomaa ja siirrä karttaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2202,35 +2214,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Lisää"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Muokkaa"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Poista {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Muuta {0} objekti"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Aseta {0}={1} kohteelle {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2240,19 +2244,26 @@
 msgstr[1] "objektit"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Aseta {0}={1} kohteelle {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2260,25 +2271,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Poista {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Poista {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Ristiriidassa oleva relaatio"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2289,11 +2300,11 @@
 "Poistetaanko relaatiosta?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2304,10 +2315,10 @@
 "Poistetaanko relaatiosta?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Katkaise polku"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2319,20 +2330,20 @@
 "<br>Oletko varma, että haluat poistaa ne?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Siirrä"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2358,43 +2369,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
+#, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "poista valinnasta"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Kierrä"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Rotate {0} {1}"
+msgstr "Poista {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Komentosarja"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2494,25 +2511,51 @@
 msgstr "Asetuksia ei voitu ladata palvelimelta."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "P"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "L"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "I"
@@ -2523,5 +2566,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2546,5 +2589,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2643,17 +2686,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2661,16 +2700,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2682,128 +2710,128 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Poistettu jäsen \"{0}\" relaatiossa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 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:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 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:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Useita \"via\" -jäseniä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Tuntematon rooli \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Ei \"from\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Ei \"to\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 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
+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
-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:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kiellolle {0} ei löydy piirtotyyliä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "ei tageja"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "teksti"
@@ -2811,5 +2839,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2837,6 +2865,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "tausta"
@@ -2846,24 +2874,9 @@
 msgstr "korostus"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Projektio \"{0}\" on suunniteltu käytettäväksi\n"
-"vain leveysasteiden 46.1° ja 57° välillä.\n"
-"Käytä muuta projektiota, jos et käytä\n"
-"ranskalaista WMS-palvelinta.\n"
-"Älä lähetä mitään dataa palvelimelle tämän viestin jälkeen."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2874,30 +2887,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Siirrä {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2909,14 +2916,14 @@
 msgstr "Kirjanmerkkiä ei voitu kirjoittaa."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Päivän viestiä ei ole saatavilla"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Ladataan \"Päivän viestiä\""
@@ -3101,5 +3108,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3161,5 +3167,5 @@
 msgstr "Loitonna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skaalaus"
@@ -3193,8 +3199,13 @@
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "taso ei ole listassa."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3202,9 +3213,9 @@
 msgstr "Yhdistetään OSM-palvelimeen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Virhe jäsennettäessä"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Tiedostoa ei löytynyt"
@@ -3264,4 +3275,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3271,4 +3283,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3276,5 +3290,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Jäsenet"
@@ -3470,7 +3485,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3550,4 +3565,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3555,4 +3573,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3562,4 +3581,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3675,7 +3695,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Ole hyvä ja anna nimi sijainnille."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3717,7 +3736,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Ei päivämäärää"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3749,7 +3767,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "poista valinnasta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3760,9 +3777,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rooli"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3780,4 +3799,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3801,8 +3822,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3813,7 +3834,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3869,5 +3891,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Komentolista"
@@ -3879,6 +3901,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3889,5 +3911,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3896,10 +3918,27 @@
 msgstr "Vaihda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Komentolista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Ristiriita"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Yhdistämisristiriidat"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Selvitä"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3907,26 +3946,4 @@
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Selvitä"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Ristiriita"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Yhdistämisristiriidat"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Ristiriidat: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -3963,45 +3980,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Napsauta ”Päivitä” päivittääksesi listan."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Näytä valittujen kohteiden historia."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekti"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Päivämäärä"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Lataa kaikki valitut objektit uudelleen ja päivitä lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Palauta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Palauta kaikkien valittujen objektien tila historialistassa valittuun "
-"versioon."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Ominaisuutta ei ole vielä toteutettu."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4134,4 +4154,18 @@
 msgid "Add Properties"
 msgstr "Lisää ominaisuuksia"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Lisää"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4244,9 +4278,9 @@
 msgstr "Valinta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Irroita paneeli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4255,5 +4289,5 @@
 "työkalupalkin napista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön"
@@ -4283,179 +4317,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Toteuta muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Perus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Jäsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Tagit (tyhjä arvo poistaa tagin)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Siirrä ylöspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Siirrä valittuja jäseniä ylöspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Lisää valitut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Lisää valitut objektit jäseniksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Poista valitut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Poista kaikki valitut objektit relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Urheilu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Poista valittu lähde listasta."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Siirrä alaspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Siirrä valittuja jäseniä alaspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "kyllä"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "ei"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Jäsenet: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relaatioeditori: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Tuonnin aikana oli ristiriitoja."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Virhe palvelimen vastauksen käsittelyssä."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Palvelimeen ei voida yhdistää."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4490,21 +4447,21 @@
 msgstr "Valitse ensin kirjanmerkki."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4514,5 +4471,5 @@
 "tähän ladataksesi alueen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Rajoittava alue"
@@ -4662,657 +4619,41 @@
 msgstr "Karttaruutujen numerot"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Lue GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Ei aikaleimaa pisteelle {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Ei löytynyt aikaleimallisia kuvia."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Luetaan {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Geo-merkityt kuvat"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "aikavyöhyke-ero: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "kuva"
-msgstr[1] "kuvat"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Tahdista kello"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-kuvat (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Kuva"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Tahdista aika GPS-yksikön kanssa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Syötettyä aikaa ei voitu tulkita oikein."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps-piste"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Muokkaa viivanpiirtotyyliä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Käytä globaaleja asetuksia."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Viivanpiirtoasetukset"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Muokkaa väriä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Oletusarvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Valitse väri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Tuo äänitiedosto"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Ääniaaltotiedostot (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Tuo kuvia"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} jälki, "
-msgstr[1] "{0} jälkeä, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} reitti, "
-msgstr[1] "{0} reittiä, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} reittipiste"
-msgstr[1] "{0} reittipistettä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Nimi: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Kuvaus: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Ajanjakso: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Pituus: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Muuta datatasoksi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Käsittelemättömän GPS-datan lähettämistä karttadatana pidetään "
-"haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Muutettu jäljestä {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-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:721
-msgid "Download everything within:"
-msgstr "Lataa kaikki  alueella:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metriä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Yhden pyynnön enimmäisalue:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} neliökilometriä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "ladatun alueen ulkopuolella"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} koostuu:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} poistettu)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Muuta GPX-tasoksi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "jälki"
-msgstr[1] "jäljet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "piste"
-msgstr[1] "pisteet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "jälki, jossa on {0} piste"
-msgstr[1] "jälki, jossa on {0} pistettä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0}:ssä on {1} jälki"
-msgstr[1] "{0}:ssä on {1} jälkeä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} piste"
-msgstr[1] "{0} pistettä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Tahdista ääni"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Ääni tahdistettu pisteessä {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL oli: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Virhe näytettäessä URL:ia"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Lisäasetukset"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Muutetaan asetusmuuttujien arvoja suoraan. Käytä tätä vain harkiten!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Nykyinen arvo on oletus."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Oletusarvo on \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Oletusarvo on tuntematon (asetusta ei ole vielä käytetty)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Ole hyvä ja valitse muokattava rivi."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Uusi arvo {0}:lle"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Ole hyvä ja valitse poistettava rivi."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Anna uusi avain/arvo-pari"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Näytä äänivalikko."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Nimetyt reittipisteet."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Näytä tai piilota äänivalikko päävalikosta."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Näytä kartalla toistettavan äänen nauhoituspaikan mukana liikkuva merkki. "
-"Paikka saadaan gps-jäljestä."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Väri"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6022,5 +5363,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6171,40 +5513,718 @@
 msgstr "Nimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Lue GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Ei aikaleimaa pisteelle {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Ei löytynyt aikaleimallisia kuvia."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Luetaan {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Geo-merkityt kuvat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "aikavyöhyke-ero: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "kuva"
+msgstr[1] "kuvat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Tahdista kello"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-kuvat (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Kuva"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Tahdista aika GPS-yksikön kanssa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Syötettyä aikaa ei voitu tulkita oikein."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps-piste"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Muokkaa viivanpiirtotyyliä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Käytä globaaleja asetuksia."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Viivanpiirtoasetukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Muokkaa väriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Oletusarvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Valitse väri"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Tuo äänitiedosto"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Ääniaaltotiedostot (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Tuo kuvia"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} jälki, "
+msgstr[1] "{0} jälkeä, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} reitti, "
+msgstr[1] "{0} reittiä, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} reittipiste"
+msgstr[1] "{0} reittipistettä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Nimi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Kuvaus: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Ajanjakso: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Pituus: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Muuta datatasoksi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Käsittelemättömän GPS-datan lähettämistä karttadatana pidetään "
+"haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Muutettu jäljestä {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+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:712
+msgid "Download everything within:"
+msgstr "Lataa kaikki  alueella:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Yhden pyynnön enimmäisalue:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} neliökilometriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datataso {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "ladatun alueen ulkopuolella"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} koostuu:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} poistettu)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Muuta GPX-tasoksi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "jälki"
+msgstr[1] "jäljet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "piste"
+msgstr[1] "pisteet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "jälki, jossa on {0} piste"
+msgstr[1] "jälki, jossa on {0} pistettä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0}:ssä on {1} jälki"
+msgstr[1] "{0}:ssä on {1} jälkeä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} piste"
+msgstr[1] "{0} pistettä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Tahdista ääni"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Ääni tahdistettu pisteessä {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL oli: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Virhe näytettäessä URL:ia"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Lisäasetukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Muutetaan asetusmuuttujien arvoja suoraan. Käytä tätä vain harkiten!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Nykyinen arvo on oletus."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Oletusarvo on \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Oletusarvo on tuntematon (asetusta ei ole vielä käytetty)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Ole hyvä ja valitse muokattava rivi."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Uusi arvo {0}:lle"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Ole hyvä ja valitse poistettava rivi."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Anna uusi avain/arvo-pari"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Näytä äänivalikko."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Nimetyt reittipisteet."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Näytä tai piilota äänivalikko päävalikosta."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Näytä kartalla toistettavan äänen nauhoituspaikan mukana liikkuva merkki. "
+"Paikka saadaan gps-jäljestä."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Väri"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Piirtotyyli {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Taso: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Valitse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Valitse väri {0}:lle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Eri objekteille käytetyt värit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Värit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6213,29 +6233,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Pakota viivojen piirto, jos segmenttejä ei ole."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Piirrä isot GPS-pisteet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Nopeus (punainen = hidas, vihreä = nopea)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Paikannuksen tarkkuus (punainen = huono, vihreä = hyvä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
@@ -6243,5 +6263,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6262,5 +6282,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6298,5 +6318,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6309,50 +6329,50 @@
 msgstr "Jalankulku (foot)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Piirrä suuntanuolet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Nopea piirto (näyttää rumemmalta)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Vain polun päähän."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Piirrä segmenttien järjestysnumerot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Piirrä ladatun alueen rajat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Piirrä virtuaalipisteet valintatilassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Piirrä epäaktiiviset tasot eri värillä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Pehmeä karttagrafiikka (antialisointi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6360,9 +6380,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6371,20 +6391,20 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Enimmäispituus (metreinä)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Piirrä GPS-pisteitä yhdistäviin viivoihin suuntanuolet"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6392,5 +6412,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6398,13 +6418,13 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Vähimmäisetäisyys (pikseleinä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6412,9 +6432,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Värittää pisteet ja jäljen segmentit nopeuden mukaan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6424,37 +6444,37 @@
 "(HDOP). Toimii vain jos tarvittava tieto on saatavilla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Jäljen ja pisteiden väritys"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS-pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Piirrä suuntanuolet polkujen segmenteille."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Piirrä polkujen segmenteille järjestysnumerot."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6462,99 +6482,119 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Piirrä epäaktiiviset tasot eri värillä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Säilytä varmuuskopiotiedostot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Lisää tallennettaessa varmuuskopiotiedostojen loppuun ~-merkki"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Näytä käynnistysruutu käynnistyksessä"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Näytä objektin tunnus valintalistassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Näytä piirtotilassa apuviiva viimeisimmästä pisteestä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Ulkoasu ja käyttötuntuma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Oletusarvo (automaattisesti päätetty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Kieli"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Käytä sisäänrakennettuja oletusarvoja"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Käytä sisäänrakennettuja oletusarvoja"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Muokkaa käytettävien liitännäisten asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Lataa lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Muokkaa sivustoja..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Valitse kohta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Muokkaa liitännäissivustoja"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Näyttöasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6562,29 +6602,29 @@
 msgstr "Asetukset, jotka vaikuttavat ohjelman visuaaliseen ilmeeseen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Yhteysasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "OSM-palvelimen yhteysasetukset."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Kartta-asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Karttaprojektion ja datatulkinnan asetukset."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Ääniasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Äänentoiston ja äänitiedostomerkkien asetukset."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
@@ -6592,70 +6632,70 @@
 "käyttöön."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Näytä koordinaatit"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Projektiometodi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Karttaprojektio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Projektiometodi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Näytä koordinaatit"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Käytä välityspalvelinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonyymi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Välityspalvelinasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Välityspalvelimen osoite"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Välityspalvelimen portti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Välityspalvelimen käyttäjänimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Välityspalvelimen salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Karttatietokantapalvelun URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM-salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6670,77 +6710,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Pikanäppäinasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Muutetaan pikanäppäimiä käsin."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Pikanäppäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
-msgid "Sort presets menu"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Käytä sisäänrakennettuja oletusarvoja"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Tagien esiasetusten lähde"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja "
-"osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Lisää uusi tagien esivalintalähde listaan."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Kuvaus: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Taso: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Muokkaajat: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Varoitus: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versio {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Käytä oletusarvoa"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Lisää tiedosto"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
 msgid "Delete the selected source from the list."
 msgstr "Poista valittu lähde listasta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+msgid "Sort presets menu"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Tagien esivalinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Tagien esivalintojen lähteet"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Erotin"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Työkalupalkki"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Käytettävissä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Työkalurivin muokkaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Muokkaa työkalupalkin elementtejä."
@@ -7002,6 +7073,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7010,7 +7081,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Tiedosto {0} on jo olemassa. Ylikirjoitetaanko?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7324,5 +7395,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7332,15 +7403,15 @@
 msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Päivitä liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Lataa liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7353,5 +7424,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7360,23 +7431,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7427,6 +7498,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Poista liitännäinen käytöstä"
@@ -7441,5 +7512,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7449,5 +7520,5 @@
 "on oikeus korvata vanhat tiedostot."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7455,10 +7526,10 @@
 msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Liitännäisen sisältämien tietojen mukaan tekijä on {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7466,9 +7537,9 @@
 "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Pitäisikö liitännäinen poistaa käytöstä?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7478,5 +7549,5 @@
 "liitännäisen käytöstä."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7484,19 +7555,19 @@
 msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Tiedot"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "kuvausta ei ole saatavilla"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7505,13 +7576,13 @@
 msgstr[1] "Ladattiin liitännäistiedot {0} sivustolta"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Liitännäistietoja ei löytynyt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Kaikki asennetut liitännäiset ovat ajantasalla."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7524,9 +7595,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Lataa puuttuvat liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7539,6 +7610,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7561,14 +7632,14 @@
 msgstr "tuntematon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versio {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Liitännäinen tulee JOSM:n mukana"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7827,45 +7898,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Tutkii hakemistoa"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Luetaan kuvia..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tutkii hakemistoa {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Sijoittele GPX-tiedoston mukaisesti"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8068,20 +8139,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8089,13 +8160,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8117,5 +8188,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
@@ -8449,5 +8520,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Tyhjä taso"
@@ -8550,17 +8621,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Tarkistussummavrihe: "
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA-tuonti onnistui"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "NMEA-tuonti epäonnistui"
+msgid "TCX Files (*.tcx)"
+msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8585,5 +8658,5 @@
 msgstr "Luo kopio polusta"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8604,11 +8677,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Tuo jälki GPX-tasolta"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Poista olemassa oleva jälki"
@@ -8617,6 +8690,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "GPX-tasoa ei löytynyt."
@@ -8679,6 +8752,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Päivitä"
@@ -8984,7 +9057,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "vesi"
@@ -9325,14 +9398,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Avaa OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9464,19 +9537,19 @@
 msgstr "Sallitut toiminnot"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Pyynnös tiedot: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Sallitaanko tämä?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9600,7 +9673,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Lähetetään..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9789,13 +9861,4 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "Tagien esiasetuslähteet täytyy määritellä ensin asetuksissa."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Tuo TCX-tiedosto..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Tuo TCX-tiedosto GPS-jälkenä"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10010,33 +10073,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10356,23 +10419,23 @@
 "Etsii keskenään lähes samannimisiä polkuja; mahdollisesti kirjoitusvirheitä."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Ominaisuustarkistin:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Etsii virheellisiä avain/arvo-pareja."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Epäkelpo tagin tarkistussääntö - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Epäkelpo oikeinkirjoituksen tarkistussääntö: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10383,5 +10446,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Virheelliset avain/arvo-parit"
@@ -10389,79 +10452,79 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Piirto-ongelma"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Avain \"{0}\" virheellinen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Tyhjät arvot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Epäkelpo avain"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Virheellinen välilyönti avaimessa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Arvossa välilyönti alussa tai lopussa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Avaimen arvossa HTML-entiteettikoodeja"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXME-avain (korjattavia karttakohteita)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Tarkista ominaisuuksien avaimet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 "Tarkista ominaisuuksien avaimet vertaamalla tunnettujen avainten listaan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10472,76 +10535,86 @@
 "php/User:JLS/speller )"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Lisää tiedosto"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Tarkista ominaisuuksien arvot."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 "Tarkista ominaisuuksien arvot vertaamalla esivalintojen tuntemiin arvoihin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Etsi FIXME:t"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Etsii solmut ja polut joissa arvona FIXME"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Käytä oletussääntötiedostoa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Käytä tarkistimen mukana tullutta sääntötiedostoa (suositus)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Käytä oletussääntötiedostoa."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Käytä tarkistimen mukana tullutta sääntötiedostoa (suositus)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Käytä oletusoikeinkirjoitussääntöjä."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 "Käytä tarkistimen mukana tullutta oikeinkirjoitussääntötiedostoa (suositus)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10687,7 +10760,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "rakennus"
@@ -10701,5 +10774,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "alue"
@@ -10709,25 +10782,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Yhdistämättömät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Etsii polut joiden päätesolmu on hyvin lähellä jotain muuta polkua."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Polun päätesolmu lähellä tietä"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Polun päätesolmu lähellä toista polkua"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Polun solmu lähellä toista polkua"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10752,17 +10825,22 @@
 msgstr "Tämä tarkistaa tagittomat, tyhjät ja yhden pisteen polut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Nimeämättömät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Muokkaa kiertoliittymän/risteyksen ominaisuuksia"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Tagittomat polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Tyhjät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Yhden pisteen polut"
@@ -10802,14 +10880,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr ""
@@ -10907,5 +10985,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10918,15 +10996,15 @@
 msgstr "Automaattinen lataus"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -10935,102 +11013,91 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "WMS-liitännäisen asetukset"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Voit muokata käytettävissä olevien WMS-palvelinten listaa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+msgid "WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "Menu Name (Default)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "WMS URL (Default)"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
-msgid "WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "Menu Name (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "WMS URL (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Lataa"
 
 #. *
@@ -11244,16 +11311,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11262,5 +11324,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11269,5 +11331,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11276,10 +11338,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12076,4 +12138,64 @@
 msgstr "Pääsy (access)"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "kyllä"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12097,5 +12219,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "yksityinen"
@@ -12143,5 +12265,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "määränpää"
@@ -12178,5 +12300,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12195,4 +12317,28 @@
 msgid "agricultural"
 msgstr ""
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "ei"
 
 #: build/trans_presets.java:315
@@ -12408,6 +12554,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "moottoritie"
@@ -12433,6 +12579,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "valtatie"
@@ -12458,6 +12604,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "kantatie"
@@ -12483,6 +12629,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "seututie"
@@ -12496,5 +12642,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "yhdystie"
@@ -12512,5 +12658,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "asuinkatu"
@@ -12528,5 +12674,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12553,6 +12716,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr ""
@@ -12602,5 +12765,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -13579,5 +13742,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "suo"
@@ -15308,27 +15471,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "urheilu"
@@ -17059,10 +17222,10 @@
 #: build/trans_presets.java:2427
 msgid "Organic"
-msgstr ""
+msgstr "Luomukauppa"
 
 #. item
 #: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
-msgstr ""
+msgstr "Muokkaa luomukaupan ominaisuuksia"
 
 #. item "Shops/Organic" text "Name"
@@ -17702,5 +17865,5 @@
 #: build/trans_presets.java:2778
 msgid "Scree"
-msgstr "kivikko, rakka"
+msgstr "Kivikko, rakka"
 
 #. item
@@ -18166,8 +18329,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "polkupyörä"
@@ -18236,8 +18399,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr ""
@@ -18263,5 +18426,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metro"
@@ -18391,4 +18554,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18397,4 +18561,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18403,4 +18568,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18409,4 +18575,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18470,7 +18637,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "silta"
@@ -18528,4 +18695,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18651,7 +18819,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18734,15 +18902,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr ""
@@ -18784,5 +18952,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr ""
@@ -18992,11 +19160,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -19034,6 +19202,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr ""
@@ -19089,7 +19257,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -19145,8 +19313,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr ""
@@ -19167,5 +19335,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19179,5 +19347,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19198,5 +19366,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "kääntöympyrä"
@@ -19211,5 +19379,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19224,5 +19392,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr ""
@@ -19236,5 +19404,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr ""
@@ -19248,5 +19416,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr ""
@@ -19274,5 +19442,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr ""
@@ -19440,13 +19608,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr ""
@@ -19508,7 +19676,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19531,10 +19699,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19554,7 +19722,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19562,8 +19733,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19608,6 +19783,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19621,5 +19796,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminaali"
@@ -19641,5 +19816,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19653,5 +19828,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19699,7 +19874,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "köysirata"
@@ -19716,5 +19891,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19729,5 +19904,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19742,5 +19917,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19755,5 +19930,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19768,5 +19943,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19781,5 +19956,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -19884,10 +20059,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19901,5 +20076,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "laituri"
@@ -19913,5 +20088,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr ""
@@ -20039,12 +20214,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr ""
@@ -20058,5 +20233,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr ""
@@ -20128,8 +20303,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20231,10 +20406,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20620,22 +20795,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20667,6 +20842,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20727,8 +20902,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr ""
@@ -21081,26 +21256,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "kauppa"
@@ -21172,8 +21347,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotelli"
@@ -21323,9 +21498,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turismi"
@@ -21397,8 +21572,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "historiallinen"
@@ -21469,8 +21644,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21484,5 +21659,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "louhos"
@@ -21496,5 +21671,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -21516,5 +21691,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "valuma-alue"
@@ -21528,5 +21703,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "talousmetsä"
@@ -21540,5 +21715,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21561,5 +21736,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr ""
@@ -21573,5 +21748,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr ""
@@ -21585,5 +21760,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21597,5 +21772,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21609,5 +21784,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21664,7 +21839,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr ""
@@ -21678,5 +21853,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -21689,5 +21864,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "huippu"
@@ -21702,5 +21877,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "jäätikkö"
@@ -21714,5 +21889,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "tulivuori"
@@ -21767,8 +21942,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr ""
@@ -21782,5 +21957,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "pusikko"
@@ -21794,5 +21969,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "nummi"
@@ -21806,5 +21981,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "metsä"
@@ -21818,5 +21993,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "muta"
@@ -21830,5 +22005,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "ranta"
@@ -21906,8 +22081,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "reitti"
@@ -21955,7 +22130,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "raja"
@@ -22097,10 +22272,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr ""
@@ -22148,6 +22323,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "osoite"
@@ -22378,10 +22553,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22389,5 +22564,5 @@
 msgstr "NPE-kartat"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22395,59 +22570,103 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr ""
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreeMap-data"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr ""
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Pyörätie"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr ""
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr ""
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr ""
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Datataso"
+
+#~ msgid "Change"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Rotate"
+#~ msgstr "Kierrä"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Valitse ainakin yksi piste, polku tai relaatio. Vain jo aikaisemmin "
-#~ "lähetetyillä elementeillä on historia."
+#~ "Projektio \"{0}\" on suunniteltu käytettäväksi\n"
+#~ "vain leveysasteiden 46.1° ja 57° välillä.\n"
+#~ "Käytä muuta projektiota, jos et käytä\n"
+#~ "ranskalaista WMS-palvelinta.\n"
+#~ "Älä lähetä mitään dataa palvelimelle tämän viestin jälkeen."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Ristiriidat: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Tagien esiasetusten lähde"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja "
+#~ "osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Lisää uusi tagien esivalintalähde listaan."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Tagien esivalintojen lähteet"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Tuo TCX-tiedosto..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
 
 #~ msgid "Uploading data"
 #~ msgstr "Lähetetään dataa"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Ominaisuutta ei ole vielä toteutettu."
+
 #~ msgid "Email"
 #~ msgstr "Sähköpostiosoite"
@@ -22455,4 +22674,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Ratkaise ristiriidat"
+
+#~ msgid "Object"
+#~ msgstr "Objekti"
 
 #~ msgid "{0} object has conflicts:"
@@ -22493,4 +22715,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Ratkaise {0} ristiriitaa {1} objektissa"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
+
+#~ msgid "Revert"
+#~ msgstr "Palauta"
+
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
+#~ "versioon."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22599,4 +22837,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Valitse ainakin yksi piste, polku tai relaatio. Vain jo aikaisemmin "
+#~ "lähetetyillä elementeillä on historia."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 16400)
+++ applications/editors/josm/i18n/po/fr.po	(revision 16407)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-24 21:02+0000\n"
-"Last-Translator: Frédéric Bonifas <fredericbonifas@gmail.com>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-02 16:11+0000\n"
+"Last-Translator: nin2jardin <Unknown>\n"
 "Language-Team: Fr\n"
 "MIME-Version: 1.0\n"
@@ -14,8 +14,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:16+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -23,6 +23,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -30,10 +30,11 @@
 msgstr "Aide"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 "La projection ne peut être lue dans les préférences. Mercator sera utilisé."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -41,10 +42,10 @@
 "sur le serveur."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Modifications non enregistrées"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr ""
@@ -52,13 +53,13 @@
 "et continuer ?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Enregistrer et quitter"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Annuler et quitter"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -71,12 +72,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -90,7 +91,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -101,32 +102,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorant l’URL malformé : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorant l URL malformé du fichier : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "INCONNU"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "À propos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Afficher l’à propos."
@@ -134,10 +135,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -145,25 +146,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Dernier changement le {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Version de Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Page d’accueil"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Rapports d'erreur"
@@ -173,5 +175,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -179,27 +181,27 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Lisez-moi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Révision"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Contribution"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Greffons"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "À propos de JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Impossible de trouver le fichier."
@@ -211,14 +213,17 @@
 "OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page "
+"d’historique des primitives OSM échouera probablement. l’URL de l’API est : "
+"\"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Veuillez sélectionner au moins un nœud ou chemin"
+msgstr ""
+"Veuillez sélectionner au moins un nœud, chemin ou relation déjà chargé."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Avertissement"
@@ -230,4 +235,6 @@
 "primitives only"
 msgstr ""
+"ATTENTION : ouverture des’ fenêtres du navigateur pour les {0} sur {1} "
+"primitives sélectionnées uniquement."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -273,5 +280,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Latitude"
@@ -280,5 +287,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Longitude"
@@ -286,5 +293,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Placer les nœuds en cercle"
@@ -297,5 +304,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -354,18 +361,19 @@
 "{0}, max is {1}"
 msgstr ""
+"Le nombre actuel de changements dépasse le maximum autorisé. Nombre "
+"courant : {0}, maximum : {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "Violation des capacités de l’API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Non initialisé"
+msgstr "Échec d’initialisation de l’API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -375,4 +383,6 @@
 "{1}"
 msgstr ""
+"Attention : troncage automatique de la valeur du champ \"{0}\" sur la "
+"primitive supprimée {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
@@ -382,9 +392,10 @@
 "length {2}. Values length is {3}."
 msgstr ""
+"La longueur de la valeur du champ \"{0}\" de la primitive {1} excède la "
+"longueur maximale autorisée {2}. la longueur actuelle est de {3}."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Condition préalable non remplie"
+msgstr "Violation de la condition prédéfinie"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -392,38 +403,40 @@
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+"{0} nœuds dans le chemin {1} excèdent le nombre maximum de nœuds autorisés "
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "les données"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "le calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "le conflit"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom sur {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoomer la vue sur {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -433,9 +446,9 @@
 msgstr "Afficher : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Rien de sélectionné sur lequel zoomer."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Aucun conflit sur lequel zoomer"
@@ -530,39 +543,43 @@
 msgstr "Veuillez sélectionner quelque chose à copier."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Créer un cercle"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 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:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr "Ces nœuds ne sont pas en cercle."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 "Veuillez sélectionner exactement trois nœuds ou un chemin contenant "
 "exactement trois nœuds."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "Ces nœuds ne sont pas en cercle."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Supprimer"
@@ -612,5 +629,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -719,11 +736,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -734,5 +752,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Erreur"
@@ -742,30 +760,30 @@
 msgstr "Choisir une licence prédéfinie"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "Aide en ligne de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Ouvrir dans le navigateur"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Édition"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -773,20 +791,20 @@
 msgstr "Recharger"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr ""
 "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Erreur durant le chargement de la page {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -803,20 +821,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr ""
-"Afficher des informations sur l’historique des chemins et des nœuds d’OSM."
+msgstr "Affiche l’historique des chemins, nœuds et relations d’OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Historique de l'élément"
+msgstr "Information sur l’élément"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr ""
-"Afficher des informations sur l’historique des chemins et des nœuds d’OSM."
+msgstr "Affiche les informations à propos des nœuds, chemins ou relations OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -879,5 +892,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Mirroir"
@@ -916,10 +929,10 @@
 msgstr "droite"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Déplacer {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -927,5 +940,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Impossible de déplacer des objets en dehors de la Terre."
@@ -1124,5 +1137,5 @@
 msgstr "Le fichier {0} existe. L'écraser ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1132,26 +1145,25 @@
 "Merci de signaler ceci comme une erreur."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Aucun document ouvert donc rien à sauvegarder."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Document vide"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Le document ne contient pas de données."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Sauvegarder tout de même"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Conflits"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1161,36 +1173,36 @@
 "sauvegardés si vous ne les traitez pas. Continuer ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Rejeter les conflits et sauvegarder"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Sauvegarder le fichier OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Sauvegarder le fichier GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Sauvegarder le calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Impossible de sauvegarder le fichier."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Extension de fichier inconnue."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Une erreur est survenue lors de la sauvegarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Une erreur est survenue lors de la restauration de la sauvegarde."
@@ -1243,6 +1255,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Fermer"
@@ -1315,12 +1328,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 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."
+"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:319
@@ -1503,69 +1514,69 @@
 msgstr "La sélection est vide"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Chargement vers OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Envoyer tous les changements sur le serveur OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Objets à ajouter :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Objets à modifier :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Objets à supprimer :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Fournissez un bref commentaire aux changements que vous envoyez :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Charger ces changements ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Envoyer les changements"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Rien à envoyer. Obtenez d’abord des données."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr ""
 "Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Aucun changement à envoyer."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr "Mise à jour des primitives"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchroniser {0} {1} seulement"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Synchroniser tout le jeu de données"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1587,17 +1598,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Conflit détecté"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "valeur inattendue retournée. Reçue {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1613,5 +1624,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1619,5 +1630,5 @@
 "Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1630,9 +1641,9 @@
 "d’erreur est :<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr "Condition préalable non remplie"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1645,18 +1656,18 @@
 "message d’erreur est :<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr "Primitive déjà supprimée"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "L’envoi vers l’API OSM a échoué"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1764,24 +1775,15 @@
 msgstr "Données GPS brutes"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Téléchargement des données"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Aucune donnée importée"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Couche de données {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Données OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Calque de données"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1799,5 +1801,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>There are {0} primitives in your local dataset which<br>might be "
@@ -1807,9 +1809,10 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
-"<html>Il y a {0} primitives dans votre jeu de données local qui<br>peuvent "
-"avoir été supprimées sur le serveur. Si vous essayez de les supprimer ou "
-"mettre à jour<br>ultérieurement, le serveur renverra un conflit."
-"<br><br>Cliquez <strong>{1}</strong> pour vérifier ces primitives "
-"individuellement.<br>Cliquez <strong>{2}</strong> pour annuler.<br></html>"
+"<html>Il y a {0} primitives dans votre jeu de données local qui<br>semblent "
+"supprimées du serveur. Si vous tentez ultérieurement de les supprimer "
+"ou<br>de les mettre à jour, le serveur retournera probablement un<br>conflit."
+"<br><br>Cliquez sur <strong>{1}</strong> pour vérifier l’état de ces "
+"primitives<br>sur le serveur.<br>Cliquez sur <strong>{2}</strong> pour "
+"ignorer.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
@@ -1828,5 +1831,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1930,5 +1933,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -1942,5 +1945,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Relacher le bouton de souris pour arrêter la rotation."
@@ -1959,7 +1962,7 @@
 "audio à ce point."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1967,9 +1970,9 @@
 msgstr "Sélectionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Sélectionner, déplacer et tourner des objets"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1978,5 +1981,28 @@
 msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Déplacer à gauche"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Déplacer à gauche"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Annuler"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1985,5 +2011,5 @@
 "fusionner avec le nœud le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2003,5 +2029,5 @@
 msgstr "Zoomer et déplacer la carte"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2283,35 +2309,27 @@
 msgstr "Erreur de communication avec le serveur"
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Changer"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Supprimer {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Changer {0} objet."
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "enlever \"{0}\" de {1} \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Mettre {0}={1} pour {2}\"{3}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2321,19 +2339,26 @@
 msgstr[1] "objets"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Enlever \"{0}\" pour {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Mettre {0}={1} pour {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
 msgstr "ChangeRelationMemberRole"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2341,25 +2366,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr "impossible de résoudre un conflit non arbitré"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Supprimer {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Supprimer {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Relation conflictuelle"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2370,11 +2395,11 @@
 "Supprimer de la relation ?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2385,10 +2410,10 @@
 "Supprimer de la relation ?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Séparer le segment du chemin"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2400,20 +2425,20 @@
 "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "Résoudre les conflits de suppression dans {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Déplacer"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2429,5 +2454,5 @@
 #, java-format
 msgid "removing reference from way {0}"
-msgstr ""
+msgstr "suppression de la référence du chemin {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
@@ -2441,9 +2466,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid "removing reference from relation {0}"
-msgstr "Élément supprimé des relations"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+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}"
@@ -2451,34 +2476,41 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+#, fuzzy, java-format
+msgid "RemoveRelationMember {0} {1}"
 msgstr "RemoveRelationMember"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Pivoter"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Supprimer {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Séquence"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../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:41
+#: ../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:52
+#: ../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
+#, fuzzy
+msgid "Main.ds doesn't include node {0}"
+msgstr "Mon jeu de données n’inclue pas d’étiquette avec la clé {0}"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2577,25 +2609,51 @@
 msgstr "Impossible de charger les préférences depuis le serveur."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "le paramètre \"{0}\" ne doit pas être vide"
+
+#: ../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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "E"
@@ -2606,5 +2664,5 @@
 msgstr "paramètre {0} > 0 requis. Reçu {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2629,5 +2687,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2727,18 +2785,14 @@
 msgstr "pas de version plus récente trouvée. L’historique est vide."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 "Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2746,16 +2800,5 @@
 msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr "le paramètre \"{0}\" ne doit pas être vide"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\""
@@ -2768,114 +2811,114 @@
 "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "La zone n'est pas fermée."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Le multipolygone \"{0}\" n'est pas fermé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Membre \"{0}\" supprimé de la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Chemin \"{0}\" comporte moins de deux points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 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:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "Plus d'un chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Plus d'un \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rôle inconnu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, 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:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Pas de chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Pas de chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 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
+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
-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:623
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Le style de la restriction {0} n'a pas été trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-chemin \"{0}\" dans le multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Le chemin intérieur \"{0}\" est à l'extérieur."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
@@ -2883,14 +2926,14 @@
 "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "non étiqueté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "texte"
@@ -2898,5 +2941,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2905,4 +2948,7 @@
 "Keeping my primitive. "
 msgstr ""
+"Ma primitive d’id {0} et de version {1} est visible bien que leur primitive "
+"de version plus ancienne {2} n’est pas visible. impossible de résoudre cette "
+"contradiction. Je conserve ma primitive. "
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -2924,6 +2970,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "arrière-plan"
@@ -2933,24 +2979,9 @@
 msgstr "surligner"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"La projection \"{0}\" est prévue pour les latitudes\n"
-"comprises entre 46,1° et 57° seulement.\n"
-"Veuillez utiliser un autre système de projection\n"
-"si vous n'utilisez pas un serveur WMS français.\n"
-"Ne pas charger de données après ce message."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2966,36 +2997,24 @@
 "et démarrez un nouveau calque sur cette nouvelle zone."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambert Zone (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (Estonie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"La projection \"{0}\" est utilisée pour\n"
-"les latitudes entre 45.7° et 47.9°\n"
-"et les longitutes entre 5.7° et 10.6° uniquement.\n"
-"Veuillez utiliser un autre système de projection si vous ne travaillez pas\n"
-"sur des données de Suisse ou du Liechtenstein.\n"
-"Ne pas envoyer de données après ce message."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grille Suisse"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Déplacer {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -3007,14 +3026,14 @@
 msgstr "Impossible d’écrire un marque-page."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Message du jour non disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- version utilisée {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Téléchargement du \"Message du jour\""
@@ -3212,5 +3231,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3272,5 +3290,5 @@
 msgstr "Zoom arrière"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "échelle"
@@ -3304,8 +3322,13 @@
 msgstr "(aucun objet)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "le calque n’est pas dans la liste."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3313,9 +3336,9 @@
 msgstr "Contact du serveur OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Erreur d’analyse"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Fichier non trouvé"
@@ -3378,4 +3401,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3385,4 +3409,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "Nœuds"
@@ -3390,5 +3416,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Membres"
@@ -3603,7 +3630,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3687,4 +3714,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3692,4 +3722,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3699,4 +3730,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3720,14 +3752,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Erreur de communication avec le serveur"
+msgstr ""
+"<html>Une erreur est survenue durant la communication avec le "
+"serveur<br>Détails :{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Erreur de communication avec le serveur"
+msgstr "La communication avec le serveur a échoué"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3794,7 +3827,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
-#, fuzzy
 msgid "Visible State:"
-msgstr "Etat supprimé :"
+msgstr "État visible :"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
@@ -3815,22 +3847,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
-#, fuzzy
 msgid "visible (on the server)"
-msgstr "Primitive supprimée du serveur"
+msgstr "visible (sur le serveur)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
-#, fuzzy
 msgid "not visible (on the server)"
-msgstr "Primitive supprimée du serveur"
+msgstr "non visible (sur le serveur)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Entrer un nom pour cet emplacement."
+msgstr "Garder une copie de la version locale"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
-#, fuzzy
 msgid "Physically delete from local dataset"
-msgstr "Ma version (jeu de données local)"
+msgstr "Supprimer physiquement du jeu de données local"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
@@ -3859,18 +3887,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
-#, fuzzy
 msgid "Keep my visible state"
-msgstr "Conserver mon état supprimé"
+msgstr "Conserver mon état de visibilité"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Oui, les restaurer également"
+msgstr "Oui, réinitialiser l’id"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Aucune date"
+msgstr "Non, annuler"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3881,17 +3906,19 @@
 "agree?</html>"
 msgstr ""
+"<html>Pour conserver votre version locale, JOSM<br>doit réinitialiser l’id "
+"de {0} {1} à 0.<br>Lors du prochain envoi le serveur lui assignera un nouvel "
+"id<br>Êtes-vous d'accord ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Réinitialisation de l’id à 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
-#, fuzzy
 msgid "Keep their visible state"
-msgstr "Conserver leur état supprimé"
+msgstr "Conserver l'état de visbilité du serveur"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
-msgstr ""
+msgstr "Oui, le supprimer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
@@ -3901,23 +3928,25 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
+"<html>JOSM va devoir supprimer votre primitive locale d’id {0}<br>du jeu de "
+"données.<br>Êtes-vous d'accord ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "supprimer de la sélection"
+msgstr "Suppression du jeu de données"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
-#, fuzzy
 msgid "Undecide conflict between visible state"
-msgstr "Ne pas résoudre le conflit d'état"
+msgstr "Conflit non résolu entre deux états de visiblité"
 
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rôle"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitive"
@@ -3937,4 +3966,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<non défini>"
@@ -3959,8 +3990,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3971,7 +4002,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -4029,5 +4061,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Pile de commandes"
@@ -4038,6 +4070,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -4048,5 +4080,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -4055,10 +4087,29 @@
 msgstr "Bascule: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Pile de commande : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Conflit"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Fusionner les conflits."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Résoudre"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Ouvrir une une fenêtre de fusion de tous les éléments sélectionnés dans la "
+"liste ci-dessus."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -4068,28 +4119,4 @@
 "Remplacer les éléments de la carte par les éléments sélectionnés de cette "
 "liste."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Résoudre"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Ouvrir une une fenêtre de fusion de tous les éléments sélectionnés dans la "
-"liste ci-dessus."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Conflit"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Fusionner les conflits."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Conflits : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -4130,45 +4157,50 @@
 "retourner à la résolution de conflits.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Cliquer sur Recharger pour rafraîchir la liste"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historique"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Afficher l’historique de tous les articles sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Date"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+"<html>Impossible de charger l’historique depuis le serveur. Détails :<br>{0}"
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "index en dehors des limites. Reçu {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr "Historique de l’objet"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "Chargement de l'historique"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr "Chargement de l’historique de {0} d’id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Recharger les objets actuellement sélectionnés et rafraîchir la liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Rétablir"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Rétablir l’état des objets actuellement sélectionnés à la version "
-"préalablement sélectionnée dans la liste de l’historique."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Pas encore implémenté."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Afficher"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr "Afficher l'historique de la primitive sélectionnée"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4304,4 +4336,18 @@
 msgid "Add Properties"
 msgstr "Ajouter des Propriétés"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Ajouter"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4414,9 +4460,9 @@
 msgstr "Sélection : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Détacher le panneau"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4425,5 +4471,5 @@
 "d'outils de gauche."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliquer pour minimiser/maximiser le contenu du panneau"
@@ -4454,179 +4500,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Appliquer les modifications"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Basique"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Occupé par"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "lié"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Déplacer vers le haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Déplacer les membres sélectionnés vers le haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Ajouter la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Ajouter les objets sélectionnés en tant que membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Supprimer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Retirer tous les objets sélectionnés de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Supprimer la source sélectionnée de la liste."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Déplacer vers le bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Déplacer les membres sélectionnés vers le bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 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"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Télécharger les membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "oui"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "non"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Membres : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editeur de relation : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Il y a eu des conflits pendant l’importation."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Erreur d'analyse de la réponse du serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Impossible de se connecter au serveur."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr "Erreur de communication avec le serveur"
@@ -4661,21 +4630,21 @@
 msgstr "Sélectionner un marque-page en premier."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "lat min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "lon min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "lat max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "lon max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4685,5 +4654,5 @@
 "télécharger la zone)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Zone de délimitation"
@@ -4837,701 +4806,51 @@
 msgstr "Numéros des tuiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Images pour {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Lecture GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Aucune heure pour le point {0}·x·{1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Aucune image avec des informations horaires lisibles trouvée."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lecture de {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Images géolocalisées"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Allumage du GPS : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Extinction du GPS : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "variation différentielle actuelle : {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "différence de fuseau horaire : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "image"
-msgstr[1] "images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} dans la trace."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Synchroniser l’horloge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "images JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "La date du fichier \"{0}\" n'a pas pu être analysée."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Image"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchroniser l’heure avec l’instrument GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "La date indiquée ne peut être analysée."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "point GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Personnaliser le dessin des lignes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Utiliser les réglages généraux."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Sélectionner les options de dessin des lignes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Personnaliser la couleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Par défaut"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Choisir une couleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Marqueurs depuis des points nommés"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Points de parcours nommés depuis {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importer Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Fichiers audio Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marqueurs audio de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importer des images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} trace, "
-msgstr[1] "{0} traces, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} chemin, "
-msgstr[1] "{0} chemins, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} chemin"
-msgstr[1] "{0} chemins"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Nom : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Description : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Intervalle de temps : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Longueur : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Convertir en calque de données"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>L’envoi de données GPS non mises en forme comme données<br>sur la "
-"carte est considéré comme nuisible.<br>Si vous voulez envoyer des traces, "
-"regardez ici :"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Converti depuis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-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:721
-msgid "Download everything within:"
-msgstr "Tout télécharger dans un rayon de :"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} mètres"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Aire maximale par requête:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Cette action nécessitera {0} demandes<br>de téléchargement séparées. "
-"Voulez-vous<br>continuer ?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Aucune trace GPX disponible dans le calque pour l'associer avec le fichier "
-"audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Des points avec un horodatage antérieur au début ou postérieur à la fin du "
-"chemin ont été omis ou déplacés au début."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Certains points dont la position est trop éloignée de la trace pour pouvoir "
-"estimer leur horodatage ont été omis."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "en dehors de la zone téléchargée"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "version {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Attention : le mélange de données 0.6 et 0.5 génère des données de version "
-"0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "Il y a eu {0} conflits durant l'import."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} est consistué de :"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} supprimés)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "non défini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "Version de l’API : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Convertir en calque GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "trace"
-msgstr[1] "traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "point"
-msgstr[1] "points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "une trace avec {0} point"
-msgstr[1] "une trace avec {0} points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} est constitué de {1} trace"
-msgstr[1] "{0} est constitué de {1} traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} point"
-msgstr[1] "{0} points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "marqueur gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "marqueur"
-msgstr[1] "marqueurs"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} est constitué de {1} marqueur"
-msgstr[1] "{0} est constitué de {1} marqueurs"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Synchronizer l’audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-"Vous devez mettre l’audio en pause au moment où vous entendez votre signal "
-"de synchronisation."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Fichier audio synchronisé au point {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-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:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"Vous devez mettre le fichier audio en pause au point de la trace où vous "
-"voulez le marqueur."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Il n'existe pas de marqueurs audio dans ce calque pour y appliquer un "
-"décalage ."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"Vous devez glisser le début de la piste audio près de la trace GPX à "
-"laquelle vous voulez l'associer (après le premier marqueur)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Vous devez faire appuyer sur Maj et déplacer la tête de lecture sur le "
-"marqueur audio ou sur le point de la trace où vous voulez synchroniser."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Impossible de créer un nouveau marqueur audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Il y a eu une erreur en essayant d’afficher l’URL pour ce marqueur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(L’URL était : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Erreur à l'affichage de l'URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Configuration avancée"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Régler les préférences directement. À utiliser avec précaution !"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Rechercher : "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "La valeur actuelle est par défaut."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "La valeur par défaut est \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"La valeur par défaut est actuellement inconnue (le réglage n’a pas encore "
-"été utilisé)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Veuille sélectionnez la rangée à éditer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Nouvelle valeur pour {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Veuillez sélectionnez la rangée à supprimer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Entrez une nouvelle paire clé/valeur"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Afficher le menu Audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Étiquetter les marqueurs audio (image et web)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Afficher la trace audio \"en direct\""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Créer des marqueurs non-audio en lisant le GPX."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Points explicites avec des horodatages valides."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-"Points explicites avec les horodatages estimées à partir de la position de "
-"la trace."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Nommer les points de parcours."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Horodatage modifié des fichiers audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Début de la trace (action par défaut si aucun autre marqueur n’est "
-"disponible)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-"Montrer ou cacher l'entrée du menu audio dans la barre de menu principal."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Afficher une icône en mouvement représentant le point sur la trace "
-"synchronisée où le fichier audio actuellement joué a été enregistré."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Placer du texte à côté des marqueurs audio (image et web) ainsi que leurs "
-"icônes."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Faire automatiquement un calque de marqueur à partir de n’importe quel "
-"points d'itinéraire à l’ouverture d’un calque GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Lors de l’import de fichiers audio, faire des marqueurs à partir de :"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-"Lors de l’import de fichiers audio, l'appliquer à n’importe quel points du "
-"calque GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Créer automatiquement des marqueurs audio à partir des points (plutôt que "
-"des points explicites) avec des noms ou des descriptions."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Créer des marqueurs audio à la position du chemin correspondant à l'heure de "
-"modification de chaque fichier WAV importé."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Nombre de secondes pour aller en avant ou en arrière lorsque le bouton "
-"approprié est pressé."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Temps pour aller en avant/arrière (en secondes)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Quantité par laquelle la vitesse est multipliée pour l’avance rapide."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Multiplicateur d’avance rapide"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"La relecture commence ce nombre de secondes avant (ou après si négatif) la "
-"position de la piste audio demandée."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Délai (en secondes)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-"Taux entre le temps écoulé par l’enregistreur de voix et le temps réellement "
-"écoulé."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Calibration de l’enregistrement de la voix"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Couleur"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "Historique de {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "Fermer la boîte de dialogue"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+"historique pas encore initialisé. Impossible de définir la référence de la "
+"primitive."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+"impossible de définir la référence. la référence d’id {0} ne correspond pas "
+"à l'historique d’id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+"échec de la définition de la référence. la référence de version {0} n’est "
+"pas disponible dans l’historique"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+"historique non encore initialisé. Impossible de définir la primitive "
+"courante."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+"impossible de définir l’en-cours. la version actuelle {0} n’est pas "
+"disponible dans l’historique"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Nœud {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6241,5 +5560,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6390,40 +5710,764 @@
 msgstr "Nom"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Version <strong>{0}</strong> créée le <strong>{1}</strong> par <strong>"
+"{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Version {0} créée le {1} par {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Version"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Images pour {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Lecture GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Aucune heure pour le point {0}·x·{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Aucune image avec des informations horaires lisibles trouvée."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lecture de {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Images géolocalisées"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Allumage du GPS : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Extinction du GPS : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "variation différentielle actuelle : {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "différence de fuseau horaire : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "image"
+msgstr[1] "images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} dans la trace."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Synchroniser l’horloge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "images JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "La date du fichier \"{0}\" n'a pas pu être analysée."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Image"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchroniser l’heure avec l’instrument GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "La date indiquée ne peut être analysée."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "point GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Personnaliser le dessin des lignes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Utiliser les réglages généraux."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Sélectionner les options de dessin des lignes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Personnaliser la couleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Par défaut"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Choisir une couleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Marqueurs depuis des points nommés"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Points de parcours nommés depuis {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importer Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Fichiers audio Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marqueurs audio de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importer des images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} trace, "
+msgstr[1] "{0} traces, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} chemin, "
+msgstr[1] "{0} chemins, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} chemin"
+msgstr[1] "{0} chemins"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Nom : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Description : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Intervalle de temps : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Longueur : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Convertir en calque de données"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>L’envoi de données GPS non mises en forme comme données<br>sur la "
+"carte est considéré comme nuisible.<br>Si vous voulez envoyer des traces, "
+"regardez ici :"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Converti depuis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+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:712
+msgid "Download everything within:"
+msgstr "Tout télécharger dans un rayon de :"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} mètres"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Aire maximale par requête:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Cette action nécessitera {0} demandes<br>de téléchargement séparées. "
+"Voulez-vous<br>continuer ?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+"Aucune trace GPX disponible dans le calque pour l'associer avec le fichier "
+"audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Des points avec un horodatage antérieur au début ou postérieur à la fin du "
+"chemin ont été omis ou déplacés au début."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Certains points dont la position est trop éloignée de la trace pour pouvoir "
+"estimer leur horodatage ont été omis."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Couche de données {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "en dehors de la zone téléchargée"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+"Attention : le mélange de données 0.6 et 0.5 génère des données de version "
+"0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Il y a eu {0} conflits durant l'import."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} est consistué de :"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} supprimés)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "non défini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "Version de l’API : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Convertir en calque GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "trace"
+msgstr[1] "traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "point"
+msgstr[1] "points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "une trace avec {0} point"
+msgstr[1] "une trace avec {0} points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} est constitué de {1} trace"
+msgstr[1] "{0} est constitué de {1} traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} point"
+msgstr[1] "{0} points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "marqueur gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "marqueur"
+msgstr[1] "marqueurs"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} est constitué de {1} marqueur"
+msgstr[1] "{0} est constitué de {1} marqueurs"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Synchronizer l’audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+"Vous devez mettre l’audio en pause au moment où vous entendez votre signal "
+"de synchronisation."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Fichier audio synchronisé au point {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+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:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Vous devez mettre le fichier audio en pause au point de la trace où vous "
+"voulez le marqueur."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Il n'existe pas de marqueurs audio dans ce calque pour y appliquer un "
+"décalage ."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Vous devez glisser le début de la piste audio près de la trace GPX à "
+"laquelle vous voulez l'associer (après le premier marqueur)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Vous devez faire appuyer sur Maj et déplacer la tête de lecture sur le "
+"marqueur audio ou sur le point de la trace où vous voulez synchroniser."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Impossible de créer un nouveau marqueur audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Il y a eu une erreur en essayant d’afficher l’URL pour ce marqueur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(L’URL était : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Erreur à l'affichage de l'URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Configuration avancée"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Régler les préférences directement. À utiliser avec précaution !"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Rechercher : "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "La valeur actuelle est par défaut."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "La valeur par défaut est \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"La valeur par défaut est actuellement inconnue (le réglage n’a pas encore "
+"été utilisé)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Veuille sélectionnez la rangée à éditer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Nouvelle valeur pour {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Veuillez sélectionnez la rangée à supprimer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Entrez une nouvelle paire clé/valeur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Afficher le menu Audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Étiquetter les marqueurs audio (image et web)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Afficher la trace audio \"en direct\""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Créer des marqueurs non-audio en lisant le GPX."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Points explicites avec des horodatages valides."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+"Points explicites avec les horodatages estimées à partir de la position de "
+"la trace."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Nommer les points de parcours."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Horodatage modifié des fichiers audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+"Début de la trace (action par défaut si aucun autre marqueur n’est "
+"disponible)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+"Montrer ou cacher l'entrée du menu audio dans la barre de menu principal."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Afficher une icône en mouvement représentant le point sur la trace "
+"synchronisée où le fichier audio actuellement joué a été enregistré."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Placer du texte à côté des marqueurs audio (image et web) ainsi que leurs "
+"icônes."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Faire automatiquement un calque de marqueur à partir de n’importe quel "
+"points d'itinéraire à l’ouverture d’un calque GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Lors de l’import de fichiers audio, faire des marqueurs à partir de :"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+"Lors de l’import de fichiers audio, l'appliquer à n’importe quel points du "
+"calque GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Créer automatiquement des marqueurs audio à partir des points (plutôt que "
+"des points explicites) avec des noms ou des descriptions."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Créer des marqueurs audio à la position du chemin correspondant à l'heure de "
+"modification de chaque fichier WAV importé."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Nombre de secondes pour aller en avant ou en arrière lorsque le bouton "
+"approprié est pressé."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Temps pour aller en avant/arrière (en secondes)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "Quantité par laquelle la vitesse est multipliée pour l’avance rapide."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Multiplicateur d’avance rapide"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"La relecture commence ce nombre de secondes avant (ou après si négatif) la "
+"position de la piste audio demandée."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Délai (en secondes)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+"Taux entre le temps écoulé par l’enregistreur de voix et le temps réellement "
+"écoulé."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Calibration de l’enregistrement de la voix"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Couleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Style de rendu {0} : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Couche : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Choisir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Choisir une couleur pour {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Mettre la valeur par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Réinitialiser"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Couleurs utilisées par les différents objets dans JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Couleurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6432,25 +6476,25 @@
 msgstr "Tous"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Fichiers locaux"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Aucun"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forcer les lignes si aucun segment importé."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Dessiner de gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Vitesse (rouge = lent, vert = rapide)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -6458,5 +6502,5 @@
 "disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Une seule couleur (peut être personnalisée pour les couches nommées)"
@@ -6464,5 +6508,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6483,5 +6527,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6519,5 +6563,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6530,16 +6574,16 @@
 msgstr "Piétons"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Dessiner les flèches de direction"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Dessin rapide (moins joli)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -6548,34 +6592,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Seulement à l'extrémité du chemin."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Afficher l’ordre des segments"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Dessiner les frontières des données téléchargées"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Dessiner des nœuds virtuels dans le mode sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Dessiner les calques inactifs avec une autre couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Lissage de la carte (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Dessine des lignes entre les points GPS bruts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6585,9 +6629,9 @@
 "Entrez '-1' pour dessiner toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Longueur maximale des fichiers locaux (mètres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6596,10 +6640,10 @@
 "dessiner toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Longueur maximale (en mètres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6608,5 +6652,5 @@
 "d’information sur les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -6614,5 +6658,5 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6621,5 +6665,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6629,13 +6673,13 @@
 "valeur l'une de l'autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Distance minimum (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Dessine de plus gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6645,9 +6689,9 @@
 "peut être personnalisée dans le Gestionnaire de Couches"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Colorier les points et segments de traces par vitesse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6658,37 +6702,37 @@
 "information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Permet de colorer la trace en fonction de la vitesse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Colorier les traces et les points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "Points GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Dessiner des flêches de direction pour les sections de chemin."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Afficher l’ordre de tous les segments de ce chemin."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Appliquer un lissage des dessins de la carte."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dessiner les limites des données chargées depuis le serveur."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6697,17 +6741,17 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dessiner les calques de données inactifs avec une autre couleur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "Données OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Garder les fichiers de sauvegarde (backup)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
@@ -6716,25 +6760,25 @@
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Afficher l'écran de démarrage"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Montrer l'ID de l'objet dans les listes de sélections"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Dessiner la ligne d'aide"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Fonctionnement sans mode (comme Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
@@ -6742,58 +6786,79 @@
 "Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Apparence et ressenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Par défaut (déterminé automatiquement)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Activer les valeurs par défaut intégrées"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Activer les valeurs par défaut intégrées"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Type de piste"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Configurer les greffons disponibles."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Télécharger la liste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Actualiser"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Configurer les sites..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr "Ajouter une description à l'URL des greffons de JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Veuillez sélectionner une entrée."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr "Modifier la description de l'URL des greffons de JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Configurer les sites de greffon."
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Réglages de l’affichage"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6801,82 +6866,82 @@
 msgstr "Divers réglages de l’apparence de tout le programme."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Réglages de connexion"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Paramètres de connexion du serveur OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Réglages de la carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 "Réglages pour la projection de la carte et l’interprétation des données."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Paramètres Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Réglages pour le lecteur et les marqueurs audios."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Afficher les coordonnées en"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Méthode de projection"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Projection de la carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Méthode de projection"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Afficher les coordonnées en"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Activer le serveur mandataire (proxy)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Paramètres du serveur mandataire (proxy)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Hôte du serveur mandataire"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Port du serveur mandataire"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Nom d’utilisateur du serveur mandataire"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Mot de passe du serveur mandataire"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "URL de base du serveur OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Nom d'utilisateur (e-mail) du compte OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6885,17 +6950,17 @@
 "aucun mot de passe."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "URL du serveur de base"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr "Nom d'utilisateur OSM (e-mail))"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "Mot de passe OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6913,78 +6978,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Configuration des raccourcis"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Changer les raccourcis clavier manuellement."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Action"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Description : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Couche : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Auteurs : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Aide : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Copier défaut"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Veuillez sélectionner la colonne à copier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Ajouter une nouvelle source à la liste."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Supprimer la source sélectionnée de la liste."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Trier le menu des balises"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Activer les valeurs par défaut intégrées"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Source de balises prédéfinies"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Les sources (URL ou nom de fichier) des fichiers de définitions des balises "
-"prédéfinies. Voir http://josm.openstreetmap.de/wiki/TaggingPresets pour plus "
-"d'informations"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Ajouter une nouvelle source de balises prédéfinies à la liste."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Supprimer la source sélectionnée de la liste."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Balises prédéfinies"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Sources des balises prédéfinies"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Séparateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Barre d'outils"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Personalisation de la barre d'outils"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Personnaliser les éléments de la barre d’outils."
@@ -7259,6 +7354,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7267,7 +7362,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Le fichier {0} existe. L'écraser ?"
+msgstr "Le fichier \"{0}\" n'existe pas"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7275,5 +7370,5 @@
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Échec de l’analyse du fichier \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
@@ -7287,4 +7382,6 @@
 msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
 msgstr ""
+"pas de primitive d’id {0} dans le jeu de données local. Impossible de "
+"déduire le type de primitive"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
@@ -7292,4 +7389,5 @@
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr ""
+"Le serveur a répondu avec une erreur 404 pour l’id {0}. Passage au suivant."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
@@ -7298,4 +7396,6 @@
 "for each primitive"
 msgstr ""
+"Le serveur a répondu par une erreur 404, nouvelle tentative en utilisant des "
+"requêtes individuelles pour chaque primitive"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -7605,8 +7705,8 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 "ATTENTION : préférence \"{0}\" ou version d’api \"{1}\" du jeu de données "
@@ -7619,15 +7719,15 @@
 msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Mise à jour des greffons"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Télécharger les greffons"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7640,5 +7740,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7647,23 +7747,23 @@
 msgstr[1] "{0} greffons téléchargé avec succès. Veuillez redémarrer JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Téléchargement du greffon {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
 msgid "Skip download"
 msgstr "Annuler le téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "Version {0} de JOSM requise pour le greffon {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Download Plugin"
 msgstr "Télécharger le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr "Annuler le téléchargement"
@@ -7714,6 +7814,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Désactiver le greffon"
@@ -7728,5 +7828,5 @@
 msgstr "Garder le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7736,5 +7836,5 @@
 "l’autorisation de remplacer les greffons existants."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7743,10 +7843,10 @@
 "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "D’après les informations du greffon, l’auteur est {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7755,9 +7855,9 @@
 "d'extension avant de rapporter un bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Ce module d'extension doit-il être désactivé ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7767,5 +7867,5 @@
 "greffon ne soit plus chargé."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7775,19 +7875,19 @@
 "obtenu JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "Aucune description disponible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "Plus de détails"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7796,13 +7896,13 @@
 msgstr[1] "La liste des geffons a été obtenue à partir de {0} sites."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Pas d'information sur les greffons trouvée."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Tous les greffons installés sont à jour."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7815,9 +7915,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Télécharger les greffons manquants"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7830,6 +7930,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7852,14 +7952,14 @@
 msgstr "inconnu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Greffon intégré à JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -8122,45 +8222,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extractions des positions GPS depuis les informations EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Début du parcours du dossier"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Un des fichiers sélectionnés était vide !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Lexture des images..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Impossible d’obtenir le chemin canonique du dossier {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Parcours du dossier {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fichier vide trouvé dans le dossier {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Corréler en GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8373,20 +8473,20 @@
 msgstr "Secondes : {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "{0} photo(s) sur {1} correspond(ent) à la trace GPX."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Différence de temps de {0} jours)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Différence entre la trace et les photos : {0}min. {1}sec."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8397,13 +8497,13 @@
 "manuellement."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "La correspondance des photos avec la trace a échoué"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Ajuster le fuseau horaire et le décalage"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Valeurs par défaut"
@@ -8425,5 +8525,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
@@ -8793,5 +8893,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Calque vide"
@@ -8898,20 +8998,22 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "Fichiers TangoGPS (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr "Erreur de format : "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "Import de TangoGPS réussi"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "Erreur d'import de TangoGPS !"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Erreur de format de fichier"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "Succès de l'import des trames NMEA"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Erreur lors de l'import des trames NMEA !"
+msgid "TCX Files (*.tcx)"
+msgstr "Fichiers TangoGPS (*.log)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8936,5 +9038,5 @@
 msgstr "Créer un chemin dupliqué"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Couche d'édition des traces GPX"
@@ -8955,11 +9057,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Importer un chemin depuis le calque GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Abandonner le chemin existant"
@@ -8968,6 +9070,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Pas de calque de données GPX trouvé."
@@ -9031,6 +9133,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Actualiser"
@@ -9341,7 +9443,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "eau"
@@ -9663,8 +9765,11 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>Le greffon openstreetbus utilise l’ancien serveur sur appspot.com."
+"<br>Un nouveau serveur est disponible sur schokokeks.org.<br>Voulez-vous "
+"passer au nouveau serveur ? (fortement recommandé)"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Basculer vers le nouveau serveur openstreetbugs ?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -9693,15 +9798,15 @@
 "L'en-tête contient plusieurs valeurs et ne peut être mappés en un seul Mot"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Ouvrir OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 "Ouvre la fenêtre OpenStreetBugs et active le téléchargement automatique"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9837,19 +9942,19 @@
 msgstr "Actions permises"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Voulez-vous permettre celà?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9968,5 +10073,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Flush Tile Cache"
-msgstr ""
+msgstr "Réinitialiser la mémoire tampon des tuiles"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
@@ -9975,7 +10080,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Envoi en cours..."
+msgstr "chargement de l’image..."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -10169,13 +10273,4 @@
 "Vous devez d'abord spécifier les sources des balises prédéfinies dans les "
 "préférences"
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importer un fichier TCX..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importer un fichier TCX comme une trace GPS"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10394,34 +10489,34 @@
 "Ouvre une boite de dialogue permettant de se rendre à une position spécifique"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Entrez la Lat./Long. pour vous rendre à la position."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Vous pouvez aussi coller une URL de www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoom (en mètres)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Aller ici"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Aller à la position"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 "Impossible d'analyser la Latitude, Longitude ou le Zoom. Veuillez vérifier."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Analyse syntaxique de la Lat./Lon. impossible"
@@ -10746,23 +10841,23 @@
 "mal ortographiés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Vérificateur de propriétés :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Ce greffon vérifie les erreurs dans les clés et les valeurs."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ligne du vérificateur d’étiquettes invalide - {0} : {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Erreur d’orthographe ligne : {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10773,5 +10868,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Combinaisons étiquette/valeur non valide"
@@ -10779,43 +10874,43 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Problème de rendu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Clé \"{0}\" non valide."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Étiquettes avec des valeurs vides"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Clé de propriété invalide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "espace blanc dans une clé non valide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Les valeurs commencent ou finissent par un espace blanc"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Les valeurs contiennent du code HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "La clé \"{0}\" ne fait pas partie des balises prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Les balises ne contiennent pas de propriété"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
@@ -10823,37 +10918,37 @@
 "La valeur \"{0}\" pour la clé \"{1}\" n'est pas dans les balises prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Les balises ne contiennent pas de valeur de propriété"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Vérifier les clés de propriétés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 "Valider que les clés sont valides en comparasion avec une liste de mots?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Utiliser un vérificateur de propriétés complexe."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valider les étiquettes et les valeurs en utilisant des règles complexes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Source de TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10864,21 +10959,21 @@
 "données de vérification des étiquettes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Ajouter une nouvelle source à la liste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Modifier la source sélectionnée."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Sources de données"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Vérifier les valeurs des propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -10886,9 +10981,9 @@
 "prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Vérifier les FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -10896,46 +10991,56 @@
 "étiquette."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Vérifier les notes de rendu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Vérifier si le rendu de carte a généré des erreurs."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Utiliser le fichier de données par défaut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Utiliser le fichier de données par défaut (recommandé)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Utiliser le fichier de données par défaut."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Utiliser le fichier de données par défaut (recommandé)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Utiliser la vérification orthographique par défaut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Utiliser le fichier de vérification d’orthographe (recommandé)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Corriger les propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Impossible de trouver le type element"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Impossible de trouver le niveau d’avertissement"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Expression interdite \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -11080,7 +11185,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "bâtiment"
@@ -11094,5 +11199,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "zone"
@@ -11102,26 +11207,26 @@
 msgstr "Chemin non fermé"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Chemins non liés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Ce test vérifie si un chemin a son dernier point très près d’un autre chemin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Fin d’un chemin près d’une autre route"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Fin d’un chemin près d’une autre chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Nœud d’un chemin à côté d’un autre chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "point final d’un chemin connecté à côté d’un autre chemin"
@@ -11146,17 +11251,22 @@
 "Ce test vérifie les chemins sans étiquette, vides ou avec un seul nœud."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Chemins non nommés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Éditer une jonction"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Chemins non étiquettés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Chemins vides"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Chemins à un seul nœud"
@@ -11197,14 +11307,14 @@
 msgstr "Sélectionner le nœud de départ à la fin d'un chemin"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr "Fin de la ligne atteinte"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr "Intersection atteinte"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Une exception s’est produite"
@@ -11327,5 +11437,5 @@
 msgstr "Ajuster la position du calque WMS sélectionné"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11340,15 +11450,15 @@
 msgstr "Téléchargement automatique"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, 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:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11357,37 +11467,37 @@
 "résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Sauvegarder la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Charger la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -11396,66 +11506,55 @@
 "attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Préférences du greffon WMS"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+"Modifier la liste des serveurs WMS affichée dans le menu du greffon WMS"
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-"Modifier la liste des serveurs WMS affichée dans le menu du greffon WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Nom du menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Nom du menu (Défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "URL de WMS (Défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Entrer un nom pour le menu et un URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Copier défaut"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Veuillez sélectionner la colonne à copier"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr "Tuiles se chevauchant"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% de lat. :"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% de lon. :"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Téléchargement"
 
 #. *
@@ -11546,5 +11645,5 @@
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Permet d’importer divers formats de fichiers directement dans JOSM."
 
 #. Plugin DirectUpload
@@ -11712,16 +11811,11 @@
 "va apparaitre). Vous pouvez démarrer le fichier .jar indépendamment."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Charger des fichiers TCX directement depuis JOSM."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Crée des maisons mytoyennes depuis des blocs entiers."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11733,5 +11827,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11742,5 +11836,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11752,10 +11846,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:67
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Téléchargement facile le long de plusieurs chemins interconnectés"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:69
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12554,4 +12648,64 @@
 msgstr "Accès"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "oui"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12575,5 +12729,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "privé"
@@ -12621,5 +12775,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "destination"
@@ -12656,5 +12810,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "permis par le propriétaire"
@@ -12673,4 +12827,28 @@
 msgid "agricultural"
 msgstr "véhicules agricoles"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "non"
 
 #: build/trans_presets.java:315
@@ -12886,6 +13064,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "motorway"
@@ -12911,6 +13089,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "voie rapide"
@@ -12936,6 +13114,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "primary"
@@ -12961,6 +13139,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "secondary"
@@ -12974,5 +13152,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "tertiary"
@@ -12990,5 +13168,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "residential"
@@ -13006,5 +13184,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "service"
@@ -13031,6 +13226,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "construction"
@@ -13080,5 +13275,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "roundabout"
@@ -14057,5 +14252,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "marais"
@@ -15786,27 +15981,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -18644,8 +18839,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "vélo/bicyclette"
@@ -18714,8 +18909,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "piéton"
@@ -18741,5 +18936,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "métro"
@@ -18869,4 +19064,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18875,4 +19071,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18881,4 +19078,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18887,4 +19085,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18948,7 +19147,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "pont"
@@ -19006,4 +19205,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19129,7 +19329,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -19212,15 +19412,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "déprécié"
@@ -19262,5 +19462,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "cheval"
@@ -19470,11 +19670,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "barrière"
@@ -19512,6 +19712,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "rue"
@@ -19567,7 +19767,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "piste"
@@ -19623,8 +19823,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "voie ferrée"
@@ -19645,5 +19845,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "services"
@@ -19657,5 +19857,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr "Ford"
@@ -19676,5 +19876,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "zone de manœuvre"
@@ -19689,5 +19889,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr "Accès d'urgence"
@@ -19702,5 +19902,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "berge"
@@ -19714,5 +19914,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "ruisseau"
@@ -19726,5 +19926,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "dock"
@@ -19752,5 +19952,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "aqueduc"
@@ -19918,13 +20118,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "artificiel"
@@ -19986,7 +20186,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "point ferroviaire"
@@ -20009,10 +20209,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "Autre voie ferrée"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "passage au dessus d'une voie ferrée"
@@ -20032,7 +20232,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -20040,8 +20243,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "ligne ferroviaire touristique"
@@ -20086,6 +20293,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "piste d'atterrissage"
@@ -20099,5 +20306,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminal"
@@ -20119,5 +20326,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "piste (sombre)"
@@ -20131,5 +20338,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "piste (claire)"
@@ -20177,7 +20384,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "couloir aérien"
@@ -20194,5 +20401,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "piste bleue"
@@ -20207,5 +20414,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "piste rouge"
@@ -20220,5 +20427,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "piste noire"
@@ -20233,5 +20440,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "piste_orange"
@@ -20246,5 +20453,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "hors piste"
@@ -20259,5 +20466,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "piste verte"
@@ -20362,10 +20569,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "alimentation électrique"
@@ -20379,5 +20586,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "appontement/jetée"
@@ -20391,5 +20598,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "oléoduc"
@@ -20517,12 +20724,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "loisir"
@@ -20536,5 +20743,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "marina"
@@ -20606,8 +20813,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "aménité"
@@ -20709,10 +20916,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "équipement de traffic"
@@ -21098,22 +21305,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "équipement lumineux"
@@ -21145,6 +21352,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "eau (claire)"
@@ -21205,8 +21412,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "santé"
@@ -21559,26 +21766,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "magasin"
@@ -21650,8 +21857,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hôtel"
@@ -21801,9 +22008,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "tourisme"
@@ -21875,8 +22082,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "patrimoine"
@@ -21947,8 +22154,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "espace vert"
@@ -21962,5 +22169,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "carrière"
@@ -21974,5 +22181,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "décharge"
@@ -21994,5 +22201,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "bassin"
@@ -22006,5 +22213,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "forêt"
@@ -22018,5 +22225,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "bâtiments de ferme"
@@ -22039,5 +22246,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "commerce de proximité"
@@ -22051,5 +22258,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "zone industrielle"
@@ -22063,5 +22270,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "terrain en friche"
@@ -22075,5 +22282,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "espace vert"
@@ -22087,5 +22294,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "zone ferroviaire"
@@ -22142,7 +22349,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "zone militaire"
@@ -22156,5 +22363,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "cimetière"
@@ -22167,5 +22374,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "sommet"
@@ -22180,5 +22387,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "glacier"
@@ -22192,5 +22399,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "volcan"
@@ -22245,8 +22452,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "nature"
@@ -22260,5 +22467,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "broussailles"
@@ -22272,5 +22479,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "lande/bruyère"
@@ -22284,5 +22491,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "bois"
@@ -22296,5 +22503,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "terrain boueux/vase"
@@ -22308,5 +22515,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "plage"
@@ -22384,8 +22591,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "route"
@@ -22433,7 +22640,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "frontière"
@@ -22575,10 +22782,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "lieu"
@@ -22626,6 +22833,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adresse"
@@ -22856,10 +23063,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Carte Open Aerial"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22867,5 +23074,5 @@
 msgstr "Cartes NPE"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22873,107 +23080,147 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO·(GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Données OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO·(GNOME·Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Voie cyclable"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO·(WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Haut Palatinat Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Rues Geofabrik.de de Rhénanie-du-Nord-Westphalie"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr "Terraserver Topo"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr "Terraserver Urbain"
 
+#~ msgid "Data Layer"
+#~ msgstr "Calque de données"
+
+#~ msgid "Change"
+#~ msgstr "Changer"
+
+#~ msgid "Rotate"
+#~ msgstr "Pivoter"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Veuillez sélectionner au moins un nœud, chemin ou relation. Seuls les "
-#~ "éléments déjà chargés ont un historique."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Restauration du chemin..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Vérification si le nœud {0} est supprimé..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Restauration de la relation..."
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Vérification si la primitive {0} est supprimée..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Conserver ma version"
-
-#~ msgid "Delete mine"
-#~ msgstr "Supprimer ma version"
+#~ "La projection \"{0}\" est prévue pour les latitudes\n"
+#~ "comprises entre 46,1° et 57° seulement.\n"
+#~ "Veuillez utiliser un autre système de projection\n"
+#~ "si vous n'utilisez pas un serveur WMS français.\n"
+#~ "Ne pas charger de données après ce message."
 
 #~ msgid ""
-#~ "<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>"
+#~ "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 ""
-#~ "<html>La primitive OSM d’id <strong>{0}</strong> a été supprimée<br>sur "
-#~ "le serveur par un autre utilisateur.<br><br>Cliquez <strong>{1}</strong> "
-#~ "pour garder votre primitive et ignorer l’état supprimé.<br>Votre "
-#~ "primitive obtiendra un nouvel id.<br>Cliquez <strong>{2}</strong> pour "
-#~ "accepter l’état du serveur et supprimer votre primitive.<br>Cliquez "
-#~ "<strong>{3}</strong> pour annuler.<br>"
+#~ "La projection \"{0}\" est utilisée pour\n"
+#~ "les latitudes entre 45.7° et 47.9°\n"
+#~ "et les longitutes entre 5.7° et 10.6° uniquement.\n"
+#~ "Veuillez utiliser un autre système de projection si vous ne travaillez "
+#~ "pas\n"
+#~ "sur des données de Suisse ou du Liechtenstein.\n"
+#~ "Ne pas envoyer de données après ce message."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Conflits : {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Source de balises prédéfinies"
 
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "<html>Il y a <strong>{0}</strong> primitives <br>sélectionnées pour mise "
-#~ "à jour. Veuillez réduire la sélection<br>à un maximum de {1} primitives.</"
-#~ "html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "La sélection est trop large"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "L’image dont le chemin est {0} n'existe pas ou est illisible."
+#~ "Les sources (URL ou nom de fichier) des fichiers de définitions des "
+#~ "balises prédéfinies. Voir http://josm.openstreetmap.de/wiki/"
+#~ "TaggingPresets pour plus d'informations"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Ajouter une nouvelle source de balises prédéfinies à la liste."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Sources des balises prédéfinies"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importer un fichier TCX..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importer un fichier TCX comme une trace GPS"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Tuiles se chevauchant"
+
+#~ msgid "% of lat:"
+#~ msgstr "% de lat. :"
+
+#~ msgid "% of lon:"
+#~ msgstr "% de lon. :"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Charger des fichiers TCX directement depuis JOSM."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO·(GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO·(GNOME·Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO·(WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Haut Palatinat Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Envoi des données"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Pas encore implémenté."
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -22981,4 +23228,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Résoudre les conflits"
+
+#~ msgid "Object"
+#~ msgstr "Objet"
 
 #~ msgid "{0} object has conflicts:"
@@ -23019,4 +23269,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Résoudre {0} conflits dans {1} objets"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Cliquer sur Recharger pour rafraîchir la liste"
+
+#~ msgid "Revert"
+#~ msgstr "Rétablir"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Rétablir l’état des objets actuellement sélectionnés à la version "
+#~ "préalablement sélectionnée dans la liste de l’historique."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -23200,4 +23466,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Veuillez sélectionner au moins un nœud, chemin ou relation. Seuls les "
+#~ "éléments déjà chargés ont un historique."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -23259,4 +23532,7 @@
 #~ msgstr "L'envoi de données a échoué pour une raison inconnue"
 
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "L’image dont le chemin est {0} n'existe pas ou est illisible."
+
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Résoudre les conflits dans la liste des membres de la relation {0}"
@@ -23272,2 +23548,50 @@
 #~ "Propriétés des éléments fusionnés. Elles remplaceront les propriétés des "
 #~ "éléments lorsque les choix de fusion seront appliqués."
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "Restauration du chemin..."
+
+#~ msgid "Checking whether node {0} is gone ..."
+#~ msgstr "Vérification si le nœud {0} est supprimé..."
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "Restauration de la relation..."
+
+#~ msgid "Checking whether primitive {0} is gone ..."
+#~ msgstr "Vérification si la primitive {0} est supprimée..."
+
+#~ msgid "Keep mine"
+#~ msgstr "Conserver ma version"
+
+#~ msgid "Delete mine"
+#~ msgstr "Supprimer ma version"
+
+#~ msgid ""
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
+#~ msgstr ""
+#~ "<html>La primitive OSM d’id <strong>{0}</strong> a été supprimée<br>sur "
+#~ "le serveur par un autre utilisateur.<br><br>Cliquez <strong>{1}</strong> "
+#~ "pour garder votre primitive et ignorer l’état supprimé.<br>Votre "
+#~ "primitive obtiendra un nouvel id.<br>Cliquez <strong>{2}</strong> pour "
+#~ "accepter l’état du serveur et supprimer votre primitive.<br>Cliquez "
+#~ "<strong>{3}</strong> pour annuler.<br>"
+
+#~ msgid ""
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
+#~ msgstr ""
+#~ "<html>Il y a <strong>{0}</strong> primitives <br>sélectionnées pour mise "
+#~ "à jour. Veuillez réduire la sélection<br>à un maximum de {1} primitives.</"
+#~ "html>"
+
+#~ msgid "Selection too big"
+#~ msgstr "La sélection est trop large"
+
+#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
+#~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données"
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 16400)
+++ applications/editors/josm/i18n/po/gl.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-19 21:20+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-27 15:34+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:16+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,31 @@
 msgstr "Axuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Consello: Algúns cambios veñen de subir novos datos ó servidor."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Cambios non gardados"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Hai cambios sen gardar. Descartar os cambios e continuar?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Gardar e Sair"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Descartar e Sair"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +69,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +88,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +99,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de ficheiro mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "DESCOÑECIDO"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Acerca de"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Amosar a pantalla de \"Acerca de\"."
@@ -131,10 +132,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,25 +143,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Último cambio en {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Versión Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Páxina de incio"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Informes de Erro"
@@ -170,5 +172,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +178,27 @@
 msgstr "Información"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Leeme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revisión"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Colaboración"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Engadidos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Acerca de JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "O ficheiro non puido ser atopado"
@@ -210,12 +212,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Por favor, seleccione como mínimo un nodo ou vía."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr ""
@@ -270,5 +271,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Latitude"
@@ -277,5 +278,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Lonxitude"
@@ -283,5 +284,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Alinear os nodos en círculo"
@@ -294,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -362,7 +363,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Sen inicializar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -381,7 +381,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Violación de condición previa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -390,37 +389,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflito"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Facer zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Facer zoom na vista a {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -430,9 +429,9 @@
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Non se seleccionou nada sobre o que facer zoom."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Non hai conflitos sobre os que facer zoom"
@@ -524,39 +523,43 @@
 msgstr "Por favor, selecciona algo para copiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Crear Círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 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:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr "Eses nodos non estan en un círculo"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 "Por favor, selecciona exactamente tres nodos, ou unha vía con tres nodos "
 "exactamente."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "Eses nodos non estan en un círculo"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Borrar"
@@ -607,5 +610,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -714,11 +717,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -729,5 +733,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Erro"
@@ -737,30 +741,30 @@
 msgstr "Escoller unha licencia predefinida"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "Axuda en liña de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Abrir nun navegador"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Edición"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -768,19 +772,19 @@
 msgstr "Recargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Erro durante a carga da páxina {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -797,18 +801,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Amosar a información do historial acerca das vías ou nodos OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Historial do Elmento"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Amosar a información do historial acerca das vías ou nodos OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -869,5 +870,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Reflexar"
@@ -906,10 +907,10 @@
 msgstr "dereita"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Mover {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -917,5 +918,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Non se poden mover objectos fora do mundo."
@@ -1112,5 +1113,5 @@
 msgstr "O arquivo {0} existe. Sobreescribir?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1120,26 +1121,25 @@
 "favor, informa disto como un erro."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Documento valeiro"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "O documento non contén datos."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Gardar de todas formas"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1149,36 +1149,36 @@
 "como se os rexeitases todos. Continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Rexeitar Conflitos e Gardar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Gardar ficheiro OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Gardar ficheiro GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Gardar Capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Non se puido facer copia de seguridade do ficheiro."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Extensión de ficheiro descoñecida."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Ocurriu un erro mentres se gardaba."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1232,6 +1232,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Pechar"
@@ -1485,68 +1486,68 @@
 msgstr "Selección valeira"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "SIbir todos os cambios ó servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Obxectos para engadir:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Obxectos para modificar:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Obxectos para borrar:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Proporciona un breve comentario para os cambios que vas a subir:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Subir estes cambios?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Subir Cambios"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algún dato antes."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Hai conflitos sen resolver. Debes resolver estes antes."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Non hai cambios que subir."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Actualizando"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr "Actualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar só {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar o paquete de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1568,17 +1569,17 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Detectado un conflito"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "valor retornado non esperado. Obtívose {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1594,5 +1595,5 @@
 "editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1601,5 +1602,5 @@
 "\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1612,9 +1613,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1627,18 +1628,18 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr "A primitiva xa foi borrada"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1745,24 +1746,15 @@
 msgstr "Datos GPS en bruto"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Descargando datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Non se importaron datos."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Capa de datos {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Datos OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Capa de datos"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1804,5 +1796,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1905,5 +1897,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 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."
@@ -1915,5 +1907,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar o botón do rato para deter a rotación."
@@ -1931,7 +1923,7 @@
 "audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1939,9 +1931,9 @@
 msgstr "Seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Seleccionar, mover e rotar obxectos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1950,5 +1942,28 @@
 msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Mover á esquerda"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Mover á esquerda"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Desfacer"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1957,5 +1972,5 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1974,5 +1989,5 @@
 msgstr "Facer zoom e mover mapa"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2246,35 +2261,27 @@
 msgstr "Erro durante a comunicación co servidor."
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Engadir"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Cambiar"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Borrar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Cambiar {0} obxecto"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Eliminar \"{0}\" para {1} \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Establecer {0}={1} para {2} \"{3}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2284,19 +2291,26 @@
 msgstr[1] "obxectos"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Eliminar \"{0}\" para {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Establecer {0}={1} para {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2304,25 +2318,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Borrar {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Borrar {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Relación contradictoria"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2333,11 +2347,11 @@
 "Borrar da relación?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Borrar da relación"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2348,10 +2362,10 @@
 "Borrar da relación?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Separar segmento de vía"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2363,20 +2377,20 @@
 "estar usandoos.<br>Queres borralos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "Resolver conflitos en estado borrado en {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Mover"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2404,9 +2418,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid "removing reference from relation {0}"
-msgstr "eliminar da selección"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
@@ -2414,34 +2428,40 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Xirar"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Borrar {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Secuencia"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../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:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2540,25 +2560,51 @@
 msgstr "Non se puideron cargar as preferencias dende o servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "o parámetro \"{0}\" debe non ser nulo"
+
+#: ../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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "E"
@@ -2569,5 +2615,5 @@
 msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2592,5 +2638,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2689,9 +2735,9 @@
 msgstr "non se atopou a última versión. O historial está valeiro."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
@@ -2699,11 +2745,5 @@
 "datos"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-"Non se atopou unha primitiva gardada en historial coa id {0} en este "
-"conxunto de datos"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2711,16 +2751,5 @@
 msgstr "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr "o parámetro \"{0}\" debe non ser nulo"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2733,127 +2762,127 @@
 msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "A vía de estilo de área non está pechada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "a vía multipoligonal \"{0}\" non está pechada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Membro \"{0}\" borrado na relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vía \"{0}\" con menos de dous puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 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:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 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:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Atopouse máis de un \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Papel \"{0}\" descoñecido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, 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:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Non se atoparon vias \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Non se atoparon vías \"ata\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 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:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Non se atopou o estilo para a restrición {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersección entre as vías ''{0}'' e ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "A vía interior ''{0}'' está fóra."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "Sen etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "texto"
@@ -2861,5 +2890,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2887,6 +2916,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "fondo"
@@ -2896,19 +2925,9 @@
 msgstr "destacar"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2919,30 +2938,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Zona Lambert (Franza)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Mover {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2954,14 +2967,14 @@
 msgstr "Non se puido escribir o marcador."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Mensaxe do día non dispoñible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaxe do día\""
@@ -3155,5 +3168,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3215,5 +3227,5 @@
 msgstr "Reducir Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "escalar"
@@ -3247,8 +3259,13 @@
 msgstr "(sen obxecto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "a capa non está na lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3256,9 +3273,9 @@
 msgstr "Contactando co servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Erro durante a análise"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Ficheiro non atopado"
@@ -3321,4 +3338,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3328,4 +3346,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3333,5 +3353,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Membros"
@@ -3527,7 +3548,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3607,4 +3628,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3612,4 +3636,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3619,4 +3644,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3638,14 +3664,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Erro durante a comunicación co servidor."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Erro durante a comunicación co servidor."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3727,17 +3752,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
-#, fuzzy
 msgid "visible (on the server)"
-msgstr "Primitiva borrada no servidor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
-#, fuzzy
 msgid "not visible (on the server)"
-msgstr "Primitiva borrada no servidor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Por favor, introduce un nome para o lugar."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3774,13 +3796,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Si, desfacer o borrado de eles tamén"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Sen Atallo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3812,7 +3832,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "eliminar da selección"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3823,9 +3842,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Papel"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3843,4 +3864,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3864,8 +3887,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3876,7 +3899,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3932,5 +3956,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Pila de Comandos"
@@ -3941,6 +3965,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3951,5 +3975,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3958,10 +3982,29 @@
 msgstr "Cambiar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Pila de Comandos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Conflito"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Combinando conflitos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Resolver"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Abrir un diálogo de combinación de todos os elementos seleccionados na lista "
+"superior."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3969,28 +4012,4 @@
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Resolver"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Abrir un diálogo de combinación de todos os elementos seleccionados na lista "
-"superior."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Conflito"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Combinando conflitos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Conflitos: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -4027,46 +4046,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Fai click en Recargar para actualizar a lista"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historial"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Amosar o historial de todos os elementos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Obxecto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Data"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr ""
 "Recargar todos os obxectos seleccionados actualmente e actualizar a lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Revertir"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-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."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Ainda sen implementar."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4200,4 +4222,18 @@
 msgid "Add Properties"
 msgstr "Engadir Propiedades"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Engadir"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4310,9 +4346,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Desacoplar o panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4321,5 +4357,5 @@
 "da esquerda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Facer click para minimizar/maximizar o contido do panel"
@@ -4350,179 +4386,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Aplicar Cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Básico"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Ocupado por"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Etiquetas (un valor vacío borra a etiqueta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Mover cara arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Mover os membros actualmente seleccionados cara arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Engadir Seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Engadir todos os obxectos seleccionados actualmente como membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Eliminar Seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Eliminar da relación todos os obxectos seleccionados actualmente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Atallo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Borrar da lista a fonte seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Mover cara abaixo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Mover os membros seleccionados actualmente cara abaixo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Eliminar o membro da fila actual desta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Descargar Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas as vías e nodos incompletos na relación"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Membros: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editor de Relación: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Houbo conflitos durante a importación."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Erro analizando a resposta do servidor."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Non se pode conectar co servidor."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4557,21 +4516,21 @@
 msgstr "Selecciona primeiro un marcador."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "lat. min."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "lon. min."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "lat. max."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "lon. max."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4581,5 +4540,5 @@
 "área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr ""
@@ -4731,679 +4690,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Imaxes para {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Ler GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Non hai hora para o punto {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Non se atoparon imaxes con marcas de tempo lexibles."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lendo {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Imaxes xeo-etiquetadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Inicio GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Fin GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "delta actual: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "Diferencia de zona horaria: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "imaxe"
-msgstr[1] "imaxes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} dentro da traza."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Sincronizar reloxo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "imaxes JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "A data no ficheiro \"{0}\" non puido ser analizada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Non hai hora EXIF no ficheiro \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Imaxe"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Zona horaria da unidade GPS (differencia coa foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizar hora coa da unidade GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "A hora introducida non puido ser analizada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "punto gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Personalizar debuxo de liñas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Usar configuración global."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Seleccionar as opcións de liña do debuxo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Personalizar Cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Escolle unha cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importar Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Ficheiros Wave Audio (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcas de audio de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importar imaxes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} trazado, "
-msgstr[1] "{0} trazados, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} ruta, "
-msgstr[1] "{0} rutas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punto de vía"
-msgstr[1] "{0} puntos de vía"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrición: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Rango de tempo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Lonxitude: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Convertir en capa de datos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>A subida de datos GPS sen procesar como datos de mapa considerase "
-"perxudicial.<br>Se desexas subir trazados, mira aqui:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Convertido de: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Descargar todo o que abarca:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metros"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Área máxima por petición:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km cad."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Esta acción require {0} peticións de<br>descarga individuais. "
-"Desexas<br>continuar?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Algúns puntos de vía que estaban demasiado lonxe da traza para estimar "
-"correctamente os seus tempos foron omitidos."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "fora da área descargada"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} composto de:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} borrados.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Convertir a capa GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "trazado"
-msgstr[1] "trazados"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punto"
-msgstr[1] "puntos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "un trazado con {0} punto"
-msgstr[1] "un trazado con {0} puntos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} componse de {1} trazado"
-msgstr[1] "{0} componse de {1} trazados"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punto"
-msgstr[1] "{0} puntos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "marca gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "marca"
-msgstr[1] "marcas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} componse de {1} marca"
-msgstr[1] "{0} componse de {1} marcas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Sincronizar Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-"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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Audio sincronizado no punto {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "Debes ter pausado o audio no punto da pista onde queres a marca."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Non se puido crear unha nova marca de audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Houbo un erro tratando de amosar a URL desta marca."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(a URL era: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Erro amosando a URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Preferencias avanzadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Establecemento directo de entradas de preferencia. Usar con coidado!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "O valor actual é o predeterminado."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "O valor predeterminado é \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"O valor predeterminado aínda descoñecido (o parámetro non se usou ainda)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Por favor selecciona a fila a editar."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Novo valor para {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Por favor seleccione a fila a borrar."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Introduce un novo par clave/valor."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Amosar o menú de audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Etiquetar as marcas de audio (e de imaxe e de web)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Amosar traza de audio en directo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Crear marcas non auditivas ó ler GPX."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Puntos de vía explícitos con marcas de tempo válidas."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Puntos de vía explícitos con hora estimada da posición da traza."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Puntos de trazado nomeados."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Horas modificadas (marcas de tempo) de ficheiros de audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Inicio de traza (facer sempre isto se non existen outras marcas dispoñibles)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-"Amosar ou ocultar a entrada do menú de audio da barra de menú principal."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Amosar unha icona enm ovemento que represente o punto da traza sincronizada "
-"onde o audio que se está a reproducir foi grabado."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Asignar etiquetas de texto a marcas de audio (e de imaxe e de web) así como "
-"ás súas iconas de botón."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Crear automáticamente unha capa de marcas desde calquer punto de vía cando "
-"se abra unha capa GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Cando se importe audio, crear marcas desde..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Cando se importe audio, aplicalo a calquera punto de vía na capa GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Crear automáticamente marcas de audio a partir dos puntos de trazado (en "
-"lugar dos puntos de vía explícitos) con nomes ou descripcións."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Crear marcas de audio na posición do trazado correspondente á hora "
-"modificada de cada ficheiro de audio WAV importado."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"O número de segundos a avanzar ou retroceder cando se presione o botón "
-"pertinente."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Tempo de avance/retroceso (segundos)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "A cantidade pola que se multiplicará a velocidade para avance rápido"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Multiplicador de avance rápido"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"A reproducción comeza este número de segundos antes (ou despois, se é "
-"negativo) da posición requerida da pista de audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Tempo de introducción (segundos)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-"A proporción entre o tempo transcurrido do grabador de voz e o tempo real "
-"transcurrido"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Calibración do grabador de voz"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Cor"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6113,5 +5434,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6262,40 +5584,740 @@
 msgstr "Nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Imaxes para {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Ler GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Non hai hora para o punto {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Non se atoparon imaxes con marcas de tempo lexibles."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Imaxes xeo-etiquetadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Inicio GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Fin GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "delta actual: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "Diferencia de zona horaria: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imaxe"
+msgstr[1] "imaxes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} dentro da traza."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Sincronizar reloxo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "imaxes JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "A data no ficheiro \"{0}\" non puido ser analizada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Non hai hora EXIF no ficheiro \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Imaxe"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Zona horaria da unidade GPS (differencia coa foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizar hora coa da unidade GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "A hora introducida non puido ser analizada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "punto gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Personalizar debuxo de liñas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Usar configuración global."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Seleccionar as opcións de liña do debuxo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Personalizar Cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Escolle unha cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importar Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Ficheiros Wave Audio (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcas de audio de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importar imaxes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} trazado, "
+msgstr[1] "{0} trazados, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} ruta, "
+msgstr[1] "{0} rutas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punto de vía"
+msgstr[1] "{0} puntos de vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrición: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Rango de tempo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Lonxitude: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Convertir en capa de datos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>A subida de datos GPS sen procesar como datos de mapa considerase "
+"perxudicial.<br>Se desexas subir trazados, mira aqui:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Convertido de: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Descargar todo o que abarca:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metros"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Área máxima por petición:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km cad."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Esta acción require {0} peticións de<br>descarga individuais. "
+"Desexas<br>continuar?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Algúns puntos de vía que estaban demasiado lonxe da traza para estimar "
+"correctamente os seus tempos foron omitidos."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Capa de datos {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "fora da área descargada"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} composto de:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} borrados.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Convertir a capa GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "trazado"
+msgstr[1] "trazados"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punto"
+msgstr[1] "puntos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "un trazado con {0} punto"
+msgstr[1] "un trazado con {0} puntos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} componse de {1} trazado"
+msgstr[1] "{0} componse de {1} trazados"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punto"
+msgstr[1] "{0} puntos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "marca gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "marca"
+msgstr[1] "marcas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} componse de {1} marca"
+msgstr[1] "{0} componse de {1} marcas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Sincronizar Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+"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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Audio sincronizado no punto {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "Debes ter pausado o audio no punto da pista onde queres a marca."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Non se puido crear unha nova marca de audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Houbo un erro tratando de amosar a URL desta marca."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(a URL era: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Erro amosando a URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Preferencias avanzadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Establecemento directo de entradas de preferencia. Usar con coidado!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "O valor actual é o predeterminado."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "O valor predeterminado é \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"O valor predeterminado aínda descoñecido (o parámetro non se usou ainda)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Por favor selecciona a fila a editar."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Novo valor para {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Por favor seleccione a fila a borrar."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Introduce un novo par clave/valor."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Amosar o menú de audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Etiquetar as marcas de audio (e de imaxe e de web)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Amosar traza de audio en directo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Crear marcas non auditivas ó ler GPX."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Puntos de vía explícitos con marcas de tempo válidas."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Puntos de vía explícitos con hora estimada da posición da traza."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Puntos de trazado nomeados."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Horas modificadas (marcas de tempo) de ficheiros de audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+"Inicio de traza (facer sempre isto se non existen outras marcas dispoñibles)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+"Amosar ou ocultar a entrada do menú de audio da barra de menú principal."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Amosar unha icona enm ovemento que represente o punto da traza sincronizada "
+"onde o audio que se está a reproducir foi grabado."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Asignar etiquetas de texto a marcas de audio (e de imaxe e de web) así como "
+"ás súas iconas de botón."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Crear automáticamente unha capa de marcas desde calquer punto de vía cando "
+"se abra unha capa GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Cando se importe audio, crear marcas desde..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "Cando se importe audio, aplicalo a calquera punto de vía na capa GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Crear automáticamente marcas de audio a partir dos puntos de trazado (en "
+"lugar dos puntos de vía explícitos) con nomes ou descripcións."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Crear marcas de audio na posición do trazado correspondente á hora "
+"modificada de cada ficheiro de audio WAV importado."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"O número de segundos a avanzar ou retroceder cando se presione o botón "
+"pertinente."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Tempo de avance/retroceso (segundos)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "A cantidade pola que se multiplicará a velocidade para avance rápido"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Multiplicador de avance rápido"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"A reproducción comeza este número de segundos antes (ou despois, se é "
+"negativo) da posición requerida da pista de audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Tempo de introducción (segundos)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+"A proporción entre o tempo transcurrido do grabador de voz e o tempo real "
+"transcurrido"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Calibración do grabador de voz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Estilo de pintura {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Capa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Escoller"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Escolle unha cor para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Establecer a predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Establecer todos ós predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Cores usadas por diferentes obxectos en JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6304,29 +6326,29 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Arquivos locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Ningún"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forzar liñas se non se importou ningún segmento."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Debuxar puntos GPS grandes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidade (vermello = lento, verde = rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color simple (pode ser personalizado para as capas con nome)"
@@ -6334,5 +6356,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6353,5 +6375,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6389,5 +6411,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6400,16 +6422,16 @@
 msgstr "Pé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Debuxar Frechas de Dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Debuxo rápido (peor resultado)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -6418,34 +6440,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Só no extremo da vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Debuxar os números de orde dos segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Debuxar os límites dos datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Debuxar nodos virtuais no modo de selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Debuxar as capas inactivas en outra cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gráficos de mapa suaves (filtro antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Debuxar liñas entre puntos GPS en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6453,9 +6475,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Lonxitude máxima para os arquivos locais (metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6464,10 +6486,10 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Lonxitude máxima (metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6476,10 +6498,10 @@
 "de liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Debuxar frechas de dirección para as liñas, conectando puntos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6488,5 +6510,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6496,13 +6518,13 @@
 "da anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima (pixeles)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Debuxar puntos máis grandes para os puntos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6512,9 +6534,9 @@
 "personalizados no Xestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Cores, puntos e segmentos de trazado en función da velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6522,28 +6544,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Permite afinar o coloreado de trazados para diferentes velocidades medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Coloreado de Trazados e Puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Debuxar consellos de dirección para segmentos de vía."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Debuxar os números de orde de todos os segmentos dentro da súa liña."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -6552,10 +6574,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Debuxar os límites dos datos cargados dende o servidor."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6564,17 +6586,17 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Debuxar as capas de datos inactivas nunha cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "Datos OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Conservar ficheiros de copia de seguridade"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
@@ -6582,82 +6604,102 @@
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Mostrar a pantalla de benvida ó iniciar"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Amosar a ID do obxecto nas listas de selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Traballando sen modo (estilo Potlach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Non requerir cambiar modos (flujo de trabajo estilo Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Apariencia e comportamento"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Por defecto (decidido automáticamente)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Activar os valores predeterminados incorporadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Activar os valores predeterminados incorporadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Configurar os engadidos dispoñibles."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Descargar lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Configurar sitios..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Por favor selecciona unha entrada."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Configurar os sitios dos engadidos"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Preferencias de Visualización"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6667,81 +6709,81 @@
 "programa."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Preferencias de Conexión"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Preferencias de conexión para o servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Preferencias do Mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Parámetros para a proxección do mapa e interpretación de datos."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Preferencias de audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Parámetros para o reproductor de audio e as marcas de audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Amosar coordenadas como"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Método de proxección"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Proxección do mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Método de proxección"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Amosar coordenadas como"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Habilitar servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Preferencias do proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Porto do servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Nome de usuario do servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Contrasinal do servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "A URL base do servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6750,17 +6792,17 @@
 "almacenar ningunha contrasinal."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "URL Base do Servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "Contrasinal OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6775,78 +6817,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Preferencias dos atallos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Cambiando manualmente os atallos de teclado."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Acción"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Atallo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Descrición: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Capa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Autores: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Axda: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versión {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Copiar Predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Engadir unha nova fonte de etiquetado preestablecido á lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Borrar da lista a fonte seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Ordenar o menú de elementos preestablecidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Activar os valores predeterminados incorporadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Fonte de etiquetado preestablecido"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"As fontes (URL ou nome de ficheiro) dos ficheiros de definición de "
-"etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/"
-"TaggingPresets para obter axuda."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Engadir unha nova fonte de etiquetado preestablecido á lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Borrar da lista a fonte seleccionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Axustes de etiquetado preestablecidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Fontes de etiquetado preestablecido."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Separador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Barra de ferramentas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Dispoñible"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Personalización de barra de ferramentas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Personalizar os elementos da barra de ferramentas."
@@ -7121,6 +7193,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7129,7 +7201,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "O arquivo {0} existe. Sobreescribir?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7447,5 +7519,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7455,15 +7527,15 @@
 msgstr "{0}% ({1}/{2}), {3} restantes. Subindo {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Actualizar Engadidos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Descargar Engadidos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7476,5 +7548,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7483,23 +7555,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7550,6 +7622,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Desactivar engadido"
@@ -7564,5 +7636,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7572,5 +7644,5 @@
 "permisos para sobrescribir os existentes."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7579,10 +7651,10 @@
 "Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Dacordo coa información contida no engadido, o autor é {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7591,9 +7663,9 @@
 "dun fallo."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Debería ser desactivado o engadido?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7601,5 +7673,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7609,19 +7681,19 @@
 "que che propocionou JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Información"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "sen descripción dispoñible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7630,13 +7702,13 @@
 msgstr[1] "Descargada información de engadidos de {0} sitios"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Non se atopou información de engadidos."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Todos os engadidos instalados estan actualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7649,9 +7721,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Descargar engadidos perdidos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7664,6 +7736,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7686,14 +7758,14 @@
 msgstr "descoñecido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versión {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Engadido empaquetado con JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7942,45 +8014,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Un dos ficheiros seleccionados era nulo !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Ler fotos..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Atopouse un ficheiro nulo no directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8179,20 +8251,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8200,13 +8272,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Valores Predeterminados"
@@ -8228,5 +8300,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Erro cargando ficheiro"
@@ -8562,5 +8634,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr ""
@@ -8665,17 +8737,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Erro de Formato de Ficheiro"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "Importación NMEA satisfactoria"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Fallo de importación NMEA!"
+msgid "TCX Files (*.tcx)"
+msgstr "Ficheiros GPX (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8700,5 +8774,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8719,11 +8793,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8732,6 +8806,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr ""
@@ -8794,6 +8868,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr ""
@@ -9099,7 +9173,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr ""
@@ -9428,14 +9502,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+msgid "Open OpenStreetBugs"
+msgstr ""
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-msgid "Open OpenStreetBugs"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9561,19 +9635,19 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9697,7 +9771,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Subindo..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9886,13 +9959,4 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importar Ficheiro TCX..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importar ficheiro TCX como trazado GPS"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10101,33 +10165,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10433,23 +10497,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10460,5 +10524,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10466,78 +10530,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10545,75 +10609,85 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Usar ficheiro de datos por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Usar o ficheiro de datos por defecto (recomendado)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Usar ficheiro de datos por defecto."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Usar o ficheiro de datos por defecto (recomendado)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Usar ficheiro de comprobación ortográfica predeterminado."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 "Usar o ficheiro de comprobación ortográfica predeterminado (recomendado)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10758,7 +10832,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr ""
@@ -10772,5 +10846,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr ""
@@ -10780,25 +10854,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10821,17 +10895,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+msgid "Unnamed Junction"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr ""
@@ -10869,14 +10947,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr ""
@@ -10974,5 +11052,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10985,117 +11063,106 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Abrir unha capa WMS en branco para cargar datos dende un ficheiro"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "WMS Plugin Preferences"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "WMS Plugin Preferences"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
+msgid "Menu Name"
 msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
-msgid "Menu Name"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Nome de Menú (Predeterminado)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "URL WMS (Predeterminada)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Copiar Predeterminado"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Descargar"
 
 #. *
@@ -11307,16 +11374,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11325,5 +11387,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11332,5 +11394,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11339,10 +11401,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12139,4 +12201,64 @@
 msgstr ""
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr ""
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12160,5 +12282,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr ""
@@ -12206,5 +12328,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr ""
@@ -12241,5 +12363,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12257,4 +12379,28 @@
 #: build/trans_presets.java:623
 msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
 msgstr ""
 
@@ -12471,6 +12617,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr ""
@@ -12496,6 +12642,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr ""
@@ -12521,6 +12667,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr ""
@@ -12546,6 +12692,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr ""
@@ -12559,5 +12705,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr ""
@@ -12575,5 +12721,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr ""
@@ -12591,5 +12737,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12616,6 +12779,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr ""
@@ -12665,5 +12828,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr ""
@@ -13642,5 +13805,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr ""
@@ -15371,27 +15534,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr ""
@@ -18229,8 +18392,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr ""
@@ -18299,8 +18462,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr ""
@@ -18326,5 +18489,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr ""
@@ -18454,4 +18617,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18460,4 +18624,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18466,4 +18631,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18472,4 +18638,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18533,7 +18700,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr ""
@@ -18591,4 +18758,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18714,7 +18882,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18797,15 +18965,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr ""
@@ -18847,5 +19015,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr ""
@@ -19055,11 +19223,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -19097,6 +19265,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr ""
@@ -19152,7 +19320,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -19208,8 +19376,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr ""
@@ -19230,5 +19398,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19242,5 +19410,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19261,5 +19429,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr ""
@@ -19274,5 +19442,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19287,5 +19455,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr ""
@@ -19299,5 +19467,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr ""
@@ -19311,5 +19479,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr ""
@@ -19337,5 +19505,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr ""
@@ -19503,13 +19671,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr ""
@@ -19571,7 +19739,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19594,10 +19762,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19617,7 +19785,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19625,8 +19796,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19671,6 +19846,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19684,5 +19859,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr ""
@@ -19704,5 +19879,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19716,5 +19891,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19762,7 +19937,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr ""
@@ -19779,5 +19954,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19792,5 +19967,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19805,5 +19980,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19818,5 +19993,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19831,5 +20006,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19844,5 +20019,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -19947,10 +20122,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19964,5 +20139,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr ""
@@ -19976,5 +20151,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr ""
@@ -20102,12 +20277,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr ""
@@ -20121,5 +20296,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr ""
@@ -20191,8 +20366,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20294,10 +20469,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20683,22 +20858,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20730,6 +20905,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20790,8 +20965,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr ""
@@ -21144,26 +21319,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr ""
@@ -21235,8 +21410,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr ""
@@ -21386,9 +21561,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr ""
@@ -21460,8 +21635,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr ""
@@ -21532,8 +21707,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21547,5 +21722,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr ""
@@ -21559,5 +21734,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr ""
@@ -21579,5 +21754,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr ""
@@ -21591,5 +21766,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr ""
@@ -21603,5 +21778,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21624,5 +21799,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr ""
@@ -21636,5 +21811,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr ""
@@ -21648,5 +21823,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21660,5 +21835,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21672,5 +21847,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21727,7 +21902,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr ""
@@ -21741,5 +21916,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr ""
@@ -21752,5 +21927,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr ""
@@ -21765,5 +21940,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr ""
@@ -21777,5 +21952,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr ""
@@ -21830,8 +22005,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr ""
@@ -21845,5 +22020,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr ""
@@ -21857,5 +22032,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr ""
@@ -21869,5 +22044,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr ""
@@ -21881,5 +22056,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr ""
@@ -21893,5 +22068,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr ""
@@ -21969,8 +22144,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr ""
@@ -22018,7 +22193,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr ""
@@ -22160,10 +22335,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr ""
@@ -22211,6 +22386,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr ""
@@ -22441,10 +22616,10 @@
 msgstr ""
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr ""
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22452,5 +22627,5 @@
 msgstr ""
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22458,48 +22633,221 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr ""
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Datos OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr ""
-
-#. yahoo://gnome-web-photo-fixed {0}
+msgid "OpenCycleMap"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr ""
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr ""
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr ""
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
+
+#~ msgid "Data Layer"
+#~ msgstr "Capa de datos"
+
+#~ msgid "Change"
+#~ msgstr "Cambiar"
+
+#~ msgid "Rotate"
+#~ msgstr "Xirar"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Conflitos: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Fonte de etiquetado preestablecido"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "As fontes (URL ou nome de ficheiro) dos ficheiros de definición de "
+#~ "etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/"
+#~ "TaggingPresets para obter axuda."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Fontes de etiquetado preestablecido."
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importar Ficheiro TCX..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importar ficheiro TCX como trazado GPS"
+
+#~ msgid "Uploading data"
+#~ msgstr "Subindo datos"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Ainda sen implementar."
+
+#~ msgid "Email"
+#~ msgstr "Correo Electrónico"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolver Conflitos"
+
+#~ msgid "Object"
+#~ msgstr "Obxecto"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} obxecto ten conflitos:"
+#~ msgstr[1] "{0} obxectos teñen conflitos:"
+
+#~ msgid "my version:"
+#~ msgstr "a miña versión:"
+
+#~ msgid "their version:"
+#~ msgstr "a súa version:"
+
+#~ msgid "resolved version:"
+#~ msgstr "versión final:"
+
+#~ 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 "Unknown host"
+#~ msgstr "Maquina descoñecida"
+
+#~ msgid "position"
+#~ msgstr "posición"
+
+#~ msgid "different"
+#~ msgstr "diferente"
+
+#~ msgid "true"
+#~ msgstr "verdadeiro"
+
+#~ msgid "false"
+#~ msgstr "falso"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Solucionar {0} conflitos en {1} obxectos"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Fai click en Recargar para actualizar a lista"
+
+#~ msgid "Revert"
+#~ msgstr "Revertir"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ 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 "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 "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki."
+
+#~ 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 "{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 "Could not download plugin: {0} from {1}"
+#~ msgstr "Non se puido descargar o engadido: {0} de {1}"
+
+#~ 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 "Plugin requires JOSM update: {0}."
+#~ msgstr "O engadido require a actualización de JOSM: {0}."
+
+#~ msgid "Plugin already exists"
+#~ msgstr "O engadido xa existe"
+
+#~ msgid "Error deleting plugin file: {0}"
+#~ msgstr "Erro borrando ficheiro de engadido: {0}"
+
+#~ msgid ""
+#~ "<html>WARNING: The password is stored in plain text in the preferences "
+#~ "file.<br>The password is transfered in plain text to the server, encoded "
+#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo "
+#~ "de preferencias.<br>O contrasinal é transferido ó servidor en texto "
+#~ "plano, codificado na URL.<br><b>Non uses un contrasinal valioso.</b></"
+#~ "html>"
+
+#~ msgid ""
+#~ "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 archive already available. Do you want to download the current "
+#~ "version by deleting existing archive?\n"
+#~ "\n"
+#~ "{0}"
+#~ msgstr ""
+#~ "O arquivo de engadidos xa esta dispoñible. Queres descargargar a versión "
+#~ "actual borrando o arquivo existente?\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid "Delete and Download"
+#~ msgstr "Borrar e Descargar"
+
+#~ msgid "Solve Conflict"
+#~ msgstr "Solucionar Conflito"
 
 #~ msgid ""
@@ -22509,4 +22857,20 @@
 #~ "Por favor, selecciona polo menos un nodo, via ou relación. Só os "
 #~ "elementos xa subidos teñen historial."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Esta acción requerirá {0} peticións de descarga individuais. Queres "
+#~ "continuar?"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
+
+#~ msgid "Cannot read numeric value from response"
+#~ msgstr "Non se pode ler valor numérico da resposta"
+
+#~ msgid "Data upload failed for unknown reason"
+#~ msgstr "A subida de datos fallou por causa descoñecida"
 
 #~ msgid "Undeleting Way..."
@@ -22555,136 +22919,6 @@
 #~ msgstr "Selección demasiado grande"
 
-#~ msgid "Uploading data"
-#~ msgstr "Subindo datos"
-
-#~ msgid "Email"
-#~ msgstr "Correo Electrónico"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolver Conflitos"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} obxecto ten conflitos:"
-#~ msgstr[1] "{0} obxectos teñen conflitos:"
-
-#~ msgid "my version:"
-#~ msgstr "a miña versión:"
-
-#~ msgid "their version:"
-#~ msgstr "a súa version:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versión final:"
-
-#~ 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 "Unknown host"
-#~ msgstr "Maquina descoñecida"
-
-#~ msgid "position"
-#~ msgstr "posición"
-
-#~ msgid "different"
-#~ msgstr "diferente"
-
-#~ msgid "true"
-#~ msgstr "verdadeiro"
-
-#~ msgid "false"
-#~ msgstr "falso"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Solucionar {0} conflitos en {1} obxectos"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
 #~ msgstr ""
-#~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki."
-
-#~ 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 "{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 "Could not download plugin: {0} from {1}"
-#~ msgstr "Non se puido descargar o engadido: {0} de {1}"
-
-#~ 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 "Plugin requires JOSM update: {0}."
-#~ msgstr "O engadido require a actualización de JOSM: {0}."
-
-#~ msgid "Plugin already exists"
-#~ msgstr "O engadido xa existe"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Erro borrando ficheiro de engadido: {0}"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo "
-#~ "de preferencias.<br>O contrasinal é transferido ó servidor en texto "
-#~ "plano, codificado na URL.<br><b>Non uses un contrasinal valioso.</b></"
-#~ "html>"
-
-#~ msgid ""
-#~ "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 archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "O arquivo de engadidos xa esta dispoñible. Queres descargargar a versión "
-#~ "actual borrando o arquivo existente?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Borrar e Descargar"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Solucionar Conflito"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Esta acción requerirá {0} peticións de descarga individuais. Queres "
-#~ "continuar?"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Non se pode ler valor numérico da resposta"
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "A subida de datos fallou por causa descoñecida"
+#~ "Non se atopou unha primitiva gardada en historial coa id {0} en este "
+#~ "conxunto de datos"
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 16400)
+++ applications/editors/josm/i18n/po/he.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-26 06:30+0000\n"
-"Last-Translator: Moshe Sayag <Unknown>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-27 16:03+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,31 @@
 msgstr "עזרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "רמז: כמה מהשינויים הגיעו מהעלאת נתונים חדשים לשרת."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "שינויים לא שמורים"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "שמור וצא"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "התעלם משינויים וצא"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +69,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +88,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +99,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "אודות"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "הצג את מסך האודות."
@@ -131,10 +132,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,25 +143,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "גירסא {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "שינוי אחרון ב {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "גירסת Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "דף הבית"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "דיווחי תקלות"
@@ -170,5 +172,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +178,27 @@
 msgstr "מידע"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "קרא אותי"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "מהדורה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "תרומה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "תוספים"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "אודות JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "לא ניתן למצוא את הקובץ."
@@ -210,12 +212,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "נא לבחור לפחות נקודה אחת או דרך"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "אזהרה"
@@ -270,5 +271,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "קו רוחב"
@@ -277,5 +278,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "קו אורך"
@@ -283,5 +284,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "סדר את הצמתים בעיגול"
@@ -294,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -380,7 +381,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "הפרת תנאי מקדים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -389,37 +389,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "נתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "שכבה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "בחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "התנגשות"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "הורד"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "התקרב אל {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "קרב את התצוגה לכדי {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -429,9 +429,9 @@
 msgstr "תצוגה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "לא נבחר פריט להתקרבות."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "אין התנגשויות להתמקד בהם"
@@ -519,37 +519,41 @@
 msgstr "אנא בחר דבר מה להעתקה."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "צור עיגול"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "צור עיגול משלושה צמתים נבחרים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "אנא בחר בדיוק שלושה צמתים או דרך אחת עם שלושה צמתים בדיוק."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "צמתים אלה אינם בעיגול."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "אנא בחר בדיוק שלושה צמתים או דרך אחת עם שלושה צמתים בדיוק."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "מחק"
@@ -599,5 +603,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -704,11 +708,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -719,5 +724,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "שגיאה"
@@ -727,30 +732,30 @@
 msgstr "בחר רשיון המוגדר מראש"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "עזרה מקוונת עבור JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "פתח בדפדפן"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "ערוך"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -758,19 +763,19 @@
 msgstr "טען מחדש"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "ניתן לערוך דפי עזרה מהעזרה המקוונת של JOSM בלבד"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "שגיאה בעת טעינת העמוד {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -785,18 +790,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "הצגת נתונים היסטוריים אודות הדרכים או הצמתים ב־OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "ההיסטוריה של האלמנט"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "הצגת נתונים היסטוריים אודות הדרכים או הצמתים ב־OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -856,5 +858,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "שיקוף"
@@ -893,10 +895,10 @@
 msgstr "ימינה"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "הזז {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -904,5 +906,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "לא ניתן להזיז פריטים אל מחוץ לעולם."
@@ -1093,5 +1095,5 @@
 msgstr "הקובץ {0} כבר קיים. לדרוס אותו?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1100,26 +1102,25 @@
 "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל תקלה."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "מסמך ריק"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "המסמך לא מכיל נתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "שמור בכל זאת"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "התנגשויות"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1129,36 +1130,36 @@
 "להמשיך?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "דחה התנגשויות ושמור"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "שמור קובץ OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "שמור קובץ GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "שמור שכבה"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "לא יכול לגבות קובץ."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "סיומת הקובץ אינה ידועה."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "אירעה שגיאה במהלך שמירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "אירעה שגיאה במהלך שחזור קובץ גיבוי."
@@ -1208,6 +1209,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "סגור"
@@ -1444,68 +1446,68 @@
 msgstr "בחירה ריקה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "העלה ל-OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "העלה את כל השינויים לשרת ה-OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "פריטים להוספה:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "פריטים לשינוי:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "פריטים למחיקה:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "העלה את השינויים האלה?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "העלה שינויים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "אין מה להעלות. קבל כמה נתונים תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "ישנן התנגשויות שאינן פתורות. עליך לפתור אותן תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "אין שינויים להעלאה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "העלאה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "סנכרן רק את {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "סנכרן את כל סט הנתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1519,17 +1521,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "התגלתה התנגשות"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "ערך מוחזר לא צפוי. התקבל {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1540,10 +1542,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1553,9 +1555,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr "הפרת תנאי מקדים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1565,18 +1567,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "העלאה ל-API של OSM נכשלה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1681,24 +1683,15 @@
 msgstr "נתוני GPS גולמיים"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "מוריד נתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "לא יובאו נתונים."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "שכבת נתונים {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "נתוני OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "שכבת נתונים"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1740,5 +1733,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1841,5 +1834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע."
@@ -1850,5 +1843,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "שחרר את סמן העכבר להפסקת ההטייה"
@@ -1866,7 +1859,7 @@
 "לסנכרון השמע בנקודה זו."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1874,9 +1867,9 @@
 msgstr "בחר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "בחר, הזז והטה פריטים"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1885,5 +1878,28 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "הזז שמאלה"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "הזז שמאלה"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "בטל"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1891,5 +1907,5 @@
 "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1906,5 +1922,5 @@
 msgstr "התמקד והזז את המפה"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2167,35 +2183,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "הוסף"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "שנה"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "מחק {0}{1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "שנה עצם {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "הסר \"{0}\" מ-{1} \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "קבע {0}={1} עבור {2} \"{3}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2205,19 +2213,26 @@
 msgstr[1] "עצמים"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "הסר \"{0}\" מ-{1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "קבע {0}={1} עבור {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2225,25 +2240,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "מחק {1}{0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "מחק {0}{1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "יחס מתנגש"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2252,11 +2267,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "מחק מיחס"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2265,10 +2280,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "פצל קטע דרך"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2279,20 +2294,20 @@
 "אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "הזז"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2318,44 +2333,50 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
+#, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "הסר מהבחירה"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "סובב"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+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:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2450,25 +2471,51 @@
 msgstr "לא יכול לטעון מאפיינים משרת."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "מעלות עשרוניות"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr "מעלות דקות שניות"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "דרום"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "צפון"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "מערב"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "מזרח"
@@ -2479,5 +2526,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2502,5 +2549,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2599,17 +2646,13 @@
 msgstr "לא נמצאה גירסה מאוחרת. ההיסטוריה ריקה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2617,16 +2660,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2638,127 +2670,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "מחק איבר \"{0}\" ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "הדרך \"{0}\" בת פחות משתי נקודות."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "יותר מ-\"to\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "יותר מ-\"via\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "אף דרך \"from\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "אף דרך \"to\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "דרך פנימית ''{0}'' נמצאת בחוץ."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "לא מתוייג"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "טקסט"
@@ -2766,5 +2798,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2792,6 +2824,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "רקע"
@@ -2801,19 +2833,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2824,30 +2846,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "מרקטור"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "הזז {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2859,14 +2875,14 @@
 msgstr "לא ניתן לכתוב סימניות."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "מסר יומי זמין"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- הגירסה שרצה היא {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "מוריד את \"המסר היומי\""
@@ -3057,5 +3073,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3117,5 +3132,5 @@
 msgstr "ריחוק צפיה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "הגדלה"
@@ -3149,8 +3164,13 @@
 msgstr "(אין עצם)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "השכבה אינה ברשימה."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3158,9 +3178,9 @@
 msgstr "יוצר קשר עם שרת ה-OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "שגיאה בעת פיענוח"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "קובץ לא נמצא"
@@ -3220,4 +3240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3227,4 +3248,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "נקודות"
@@ -3232,5 +3255,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "חברים"
@@ -3434,7 +3458,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3514,4 +3538,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3519,4 +3546,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3526,4 +3554,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3552,7 +3581,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "שגיאה בהתקשרות עם השרת."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3640,7 +3668,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "נא הזן שם עבור המיקום."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3673,18 +3700,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
-#, fuzzy
 msgid "Keep my visible state"
-msgstr "שמור את הקואורדינטות שלי"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "כן, בטל גם את המחיקה שלהם"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "אין תאריך"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3701,7 +3725,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
-#, fuzzy
 msgid "Keep their visible state"
-msgstr "שמור את הקואורדינטות שלהם"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
@@ -3717,7 +3740,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "הסר מהבחירה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3728,9 +3750,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "תפקיד"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3748,4 +3772,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<לא מוגדר>"
@@ -3769,8 +3795,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3781,7 +3807,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3837,5 +3864,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "מצבור פקודות"
@@ -3846,6 +3873,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3856,5 +3883,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3863,10 +3890,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "מצבור פקודות: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "התנגשות"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "התנגשויות מתמזגות"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "פתור"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3875,26 +3919,4 @@
 msgstr "הגדר את הפריטים הנבחרים שעל המפה לפריטים הנבחרים ברשימה שלהלן."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "פתור"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "התנגשות"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "התנגשויות מתמזגות"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "התנגשויות: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -3930,43 +3952,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "לחץ \"טען מחדש\" כדי לרענן את הרשימה"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "היסטוריה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "הצג את ההיסטוריה של כל הפריטים הבחורים."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "פריט"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "תאריך"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "טען מחדש את כל העצמים הבחורים ורענן את הרשימה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "להחזיר לקדמותו"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "עדיין לא הוטמע."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4099,4 +4126,18 @@
 msgid "Add Properties"
 msgstr "הוסף תכונות"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "הוסף"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4209,14 +4250,14 @@
 msgstr "בחירה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "\"שחרר\" את הפאנל"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל"
@@ -4246,179 +4287,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "החל שינויים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "בסיסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "תפוס ע\"י"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "תוויות (ערך ריק מוחק את התווית)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "העלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "הזז את החברים הנבחרים מעלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "הוסף את הנבחרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "הוסף את כל העצמים הנבחרים כחברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "הסרת הנבחרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "הסר את כל העצמים הנבחרים מהיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "ספורט"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "מחק את המקור הנבחר מהרשימה"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "הורד"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "הזז מטה את החברים שנבחרו"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "הורד חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "כן"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "לא"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "חברים: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "עורך יחסים: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "ארעו התנגשויות במהלך הייבוא."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "שגיאה בניתוח תשובת השרת."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "לא יכול להתחבר לשרת"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr "שגיאה בהתקשרות עם השרת."
@@ -4453,21 +4417,21 @@
 msgstr "בחר סימניה תחילה."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "רוחב מזערי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "אורך מזערי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "רוחב מירבי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "אורך מירבי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4476,5 +4440,5 @@
 "כתובת מ www.openstreetmap.org (אתה יכול להדביק כאן כתובת להורדת האיזור)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr ""
@@ -4623,659 +4587,41 @@
 msgstr "מספרי משטחים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "תמונות עבור {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "קורא GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "אין זמן לנקודה {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "לא נמצאו תמונות עם חותמות זמין קריאות."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "קורא {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "תמונות בעלות גאותגיות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "התחלת GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "סיום GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "הפרש נוכחי: {0}ש'"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "הפרש אזורי הזמן: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "תמונה"
-msgstr[1] "תמונות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} מתוך הרצועה."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "סנכרן שעון"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "תמונות JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "תמונה"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "סנכרן את השעה עם יחידת ה-GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "לא ניתן לנתח את הזמן שהוזן."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "נקודת gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "התאם ציור קו"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "השתמש בהגדרות הגלובליות."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "צייר קווים בין נקודות בשכבה זו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr "אל תצייר קווים בין נקודות בשכבה זו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "בחר אפשרויות ציור קו"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "התאם צבעים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "אישור"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "ברירת מחדל"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "בחר צבע"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "סמנים מנקודות בעלות שם"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "ייבא שמע"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "קובץ שמע (wav.*)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "סמן שמע מ {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "ייבא תמונות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "נקודת דרך {0}"
-msgstr[1] "{0} נקודות דרך"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "שם: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "תיאור: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "אורך: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "המר לשכבת נתונים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>העלאת קובץ נתוני GPS לא מעובדים נחשבת מזיקה.<br>אם אתה רוצה להעלות "
-"מסלולים, ראה כאן:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "המר מ: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "הורד הכל עם:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} מטרים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "שטח מירבי לבקשה"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} קמ\"ר"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>הפעולה הזו דורשת {0} בקשות<br>הורדה נפרדות. האם אתה רוצה<br>להמשיך?</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"כמה נקודות דרך שהיו רחוקות מידי מהמסלול מכדי שיהיה אפשר להעריך את הזמן שלהם "
-"באופן הגיוני הושמטו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "מחוץ לשטח שהורד"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "גירסה {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "נמצאו {0} התנגשויות במהלך היבוא"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} מורכב מ-:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} נמחק/ו.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "גירסת API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "המר לשכבת GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "מסלול"
-msgstr[1] "מסלולים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "נקודה"
-msgstr[1] "נקודות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "מסלול בעל נקודה {0}"
-msgstr[1] "מסלול בעל {0} נקודות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} מורכב ממסלול {1}"
-msgstr[1] "{0} מורכב מ-{1} מסלולים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "נקודה {0}"
-msgstr[1] "{0} נקודות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "סמן gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "סמן"
-msgstr[1] "סמנים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} מורכב מסמן {1}"
-msgstr[1] "{0} מורכב מ-{1} סמנים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "סנכרן שמע"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "אתה צריך לעצור את השמע בנקודה על המסלול שבה אתה רוצה את הסמן."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "לא יכול ליצור סמן שמע חדש."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "היתה שגיאה בניסיון להציג את הכתובת לסמן זה"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(הכתובת היתה: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "שגיאה בהצגת URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "מאפיינים מתקדמים"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "קביעת ישירה של כניסות מאפיינים. השתמש בזהירות!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "חפש: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "ערך נוכחי הינו ברירת מחדל"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "ערך ברירת המחדל הוא \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "ערכי ברירת מחדל לא ידועים ברגע זה (קביעה לא היתה עדיין בשימוש)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "נא בחר את השורה לעריכה."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "ערך חדש עבור {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "נא בחר את השורה למחיקה."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "הכנס צמד מפתח\\ערך חדש"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "הצג את תפריט השמע."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "בזמן ייבוא שמע, צור סמנים מ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "כיול רשם קול"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "צבע"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -5985,5 +5331,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6134,40 +5481,720 @@
 msgstr "שם"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "תמונות עבור {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "קורא GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "אין זמן לנקודה {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "לא נמצאו תמונות עם חותמות זמין קריאות."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "קורא {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "תמונות בעלות גאותגיות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "התחלת GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "סיום GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "הפרש נוכחי: {0}ש'"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "הפרש אזורי הזמן: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "תמונה"
+msgstr[1] "תמונות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} מתוך הרצועה."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "סנכרן שעון"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "תמונות JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "תמונה"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "סנכרן את השעה עם יחידת ה-GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "לא ניתן לנתח את הזמן שהוזן."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "נקודת gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "התאם ציור קו"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "השתמש בהגדרות הגלובליות."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "צייר קווים בין נקודות בשכבה זו."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr "אל תצייר קווים בין נקודות בשכבה זו."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "בחר אפשרויות ציור קו"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "התאם צבעים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "אישור"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "ברירת מחדל"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "בחר צבע"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "סמנים מנקודות בעלות שם"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "ייבא שמע"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "קובץ שמע (wav.*)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "סמן שמע מ {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "ייבא תמונות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "נקודת דרך {0}"
+msgstr[1] "{0} נקודות דרך"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "שם: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "תיאור: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "אורך: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "המר לשכבת נתונים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>העלאת קובץ נתוני GPS לא מעובדים נחשבת מזיקה.<br>אם אתה רוצה להעלות "
+"מסלולים, ראה כאן:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "המר מ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "הורד הכל עם:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} מטרים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "שטח מירבי לבקשה"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} קמ\"ר"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>הפעולה הזו דורשת {0} בקשות<br>הורדה נפרדות. האם אתה רוצה<br>להמשיך?</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"כמה נקודות דרך שהיו רחוקות מידי מהמסלול מכדי שיהיה אפשר להעריך את הזמן שלהם "
+"באופן הגיוני הושמטו."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "שכבת נתונים {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "מחוץ לשטח שהורד"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "גירסה {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "נמצאו {0} התנגשויות במהלך היבוא"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} מורכב מ-:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} נמחק/ו.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "גירסת API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "המר לשכבת GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "מסלול"
+msgstr[1] "מסלולים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "נקודה"
+msgstr[1] "נקודות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "מסלול בעל נקודה {0}"
+msgstr[1] "מסלול בעל {0} נקודות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} מורכב ממסלול {1}"
+msgstr[1] "{0} מורכב מ-{1} מסלולים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "נקודה {0}"
+msgstr[1] "{0} נקודות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "סמן gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "סמן"
+msgstr[1] "סמנים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} מורכב מסמן {1}"
+msgstr[1] "{0} מורכב מ-{1} סמנים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "סנכרן שמע"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "אתה צריך לעצור את השמע בנקודה על המסלול שבה אתה רוצה את הסמן."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "לא יכול ליצור סמן שמע חדש."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "היתה שגיאה בניסיון להציג את הכתובת לסמן זה"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(הכתובת היתה: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "שגיאה בהצגת URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "מאפיינים מתקדמים"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "קביעת ישירה של כניסות מאפיינים. השתמש בזהירות!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "חפש: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "ערך נוכחי הינו ברירת מחדל"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "ערך ברירת המחדל הוא \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "ערכי ברירת מחדל לא ידועים ברגע זה (קביעה לא היתה עדיין בשימוש)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "נא בחר את השורה לעריכה."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "ערך חדש עבור {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "נא בחר את השורה למחיקה."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "הכנס צמד מפתח\\ערך חדש"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "הצג את תפריט השמע."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "בזמן ייבוא שמע, צור סמנים מ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "כיול רשם קול"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "צבע"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "סגנון ציור {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "בחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "בחר צבע עבור {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "צבעים בשימוש עצמים אחרים ב JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "צבעים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6176,29 +6203,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "הכרח קווים במידה ולא יובאו מקטעים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "צייר נקודות GPS גדולות."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -6206,5 +6233,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6225,5 +6252,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6261,5 +6288,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6272,50 +6299,50 @@
 msgstr "רגל"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "צייר חיצי כיוון"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "ציור מהיר (נראה מכוער יותר)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "רק רמזי כיוון מעניינים (למשל עם תג חד-סטרי)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "רק בראשית הדרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "צייר מספרים סידוריים של קטע"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "צייר גבולות של נתונים שהורדו"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "צייר נקודות וירטואליות במצב הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "צייר שכבות לא פעילות בצבע שונה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "החלק גרפיקה של מפה (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6323,34 +6350,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ'1-' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "אורך מירבי (מטרים)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "הכרח ציור קווים במידה והנתונים המיובאים אינם מכילים נתוני קווים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "צייר חצי כיוון לקווים המחברים נקודות GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6358,13 +6385,13 @@
 msgstr "אל תצייר חצים אם הם לא לפחות במרחק זה מהקודם."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "מרחק מינימלי (פיקסלים)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "צייר נקודות גדולות יותר עבור נקודות ה-GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6372,9 +6399,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6382,136 +6409,157 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "נקודות GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "צייר רמזי כיוון עבור קטעי דרך."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "צייר את גבולות המידע שמורד מהשרת."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "צייר את שכבת הנתונים הלא פעילה בצבע אחר."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "נתוני OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "שמור קובצי גיבוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "בזמן שמירה, שמור קובצי גיבוי המסתיימים ב ~"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "הצג מסך פתיחה בפתיחה"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "מראה ומרגש"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "ברירת מחדל (נקבע אוטומטית)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "שפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "אפשר ברירות מחדל מובנות"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "אפשר ברירות מחדל מובנות"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "סוג מסלול"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "התאם תוספים זמינים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "הורד רשימה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "עדכן"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "התאם אתרים..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "בחר כניסה."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "התאם אתרי תוספים"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "הגדרות תצוגה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6519,98 +6567,98 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "הגדרות חיבור"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "הגדרות חיבור לשרת OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "הגדרות מפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "הגדרות שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "יהיה עליך להפעיל את JOSM מחדש כדי שכמה מההגדרות יכנסו לתוקף."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "הצג קורדינטות כ"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "שיטת הטלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "הטלת מפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "שיטת הטלה"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "הצג קורדינטות כ"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "אפשר שרת פרוקסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "אנונימי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "הגדרות פרוקסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "מארח שרת פרוקסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "פורט שרת פרוקסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "שם משתמש שרת פרוקסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "סיסמת שרת פרוקסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "כתובת שרת הבסיס"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "סיסמת OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6625,75 +6673,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "מאפייני קיצור"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "שינוי קיצור מקלדת ידנית"
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "פעולה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "קיצור-דרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
-msgid "Sort presets menu"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "אפשר ברירות מחדל מובנות"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "תיאור: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "שכבות: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "מחברים: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "עזרה: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "גירסא {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "העתק ברירת מחדל"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "בחר שורה להעתקה"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "הוסף מקור חדש לרשימה"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
 msgid "Delete the selected source from the list."
 msgstr "מחק את המקור הנבחר מהרשימה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+msgid "Sort presets menu"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "מפריד"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "סרגל כלים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "זמין"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "התאמת סרגל כלים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "התאם את האלמנטים בסרגל הכלים."
@@ -6943,6 +7024,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -6951,7 +7032,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "הקובץ {0} כבר קיים. לדרוס אותו?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7265,5 +7346,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7273,15 +7354,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "עדכן תוספים"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7294,5 +7375,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7301,23 +7382,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7365,6 +7446,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "נטרל תוסף"
@@ -7379,5 +7460,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7387,5 +7468,5 @@
 "הקיימים."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7393,19 +7474,19 @@
 msgstr "שגיאה בלתי צפויה אירעה שנובעת כנראה מהתוסף \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "לפי המידע בתוסף, המחבר הוא {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr "נסה לעדכן לגירסא האחרונה של התוסף לפני דיווח על תקלה."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "האם התוסף צריך ליהיות מנוטרל?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7413,5 +7494,5 @@
 msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7419,19 +7500,19 @@
 msgstr "לא ניתן להסיר את התוסף. אנא ספר למי שסיפק לך את JOSM על הבעיה."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "מידע"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "אין תיאור זמין"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7440,13 +7521,13 @@
 msgstr[1] "הורד מידע על התוסף מ{0} אתרים"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "מידע על התוסף לא נמצא."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "כל התוספים המותקנים מעודכנים."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7459,9 +7540,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "הורד תוספים חסרים"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7474,6 +7555,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7496,14 +7577,14 @@
 msgstr "לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: גירסא {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "תוסף ארוז עם JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7758,45 +7839,45 @@
 "{0} קמ\"ש"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "מחלץ מיקומי GPS מ-EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "מתחיל סריקת ספרייה"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "אחד מהקבצים הנבחרים היה null !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "קורא תמונות..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "לא יכול לקבל נתיב קנוני לתיקייה {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "קורא ספרייה {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "נמצא קובץ null בתיקייה {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7999,20 +8080,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8020,13 +8101,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8048,5 +8129,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "שגיאה בטעינת קובץ"
@@ -8380,5 +8461,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "שכבה ריקה"
@@ -8481,17 +8562,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "שגיאה בפורמט קובץ"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "יבוא NMEA הסתיים בהצלחה"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "יבוא NMEA נכשל!"
+msgid "TCX Files (*.tcx)"
+msgstr "קבצי GPX‏ (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8516,5 +8599,5 @@
 msgstr "ייצר דרך משוכפלת"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8535,11 +8618,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "ייבא נתיב משכבת GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "זנח נתיב קיים"
@@ -8548,6 +8631,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "לא נמצאה שכבת נתוני GPX"
@@ -8610,6 +8693,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "רענן"
@@ -8915,7 +8998,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "מים"
@@ -9247,14 +9330,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "פתח את OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9383,19 +9466,19 @@
 msgstr "פעולות מורשות"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr "שלט רחוק ביקש להוריד נתונים מה-API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "בקש פרטים: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "האם אתה רוצה לאשר את זה?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9519,7 +9602,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "מעלה..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9708,13 +9790,4 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "ייבא קובץ TCX..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "ייבא קובץ TCX כמסלולי GPS"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -9923,33 +9996,33 @@
 msgstr "פותח דיאלוג שמאפשר לך לקפוץ למיקום מסויים"
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "מיקוד (במטרים)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "כתובת"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "קפוץ לשם"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10257,23 +10330,23 @@
 msgstr "מבחן זה מחפש דרכים עם שמות דומים שעלולים לנבוע משגיאות כתיב."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "בודק תכונות:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "תוסף זה מחפש שגיאות במפתחות וערכים של תכונות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10284,5 +10357,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "צירופי תווית \\ ערך לא חוקיים"
@@ -10290,78 +10363,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "בעיית ציור"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "מפתח \"{0}\" לא תקין."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "תוויות עם ערכים ריקים"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "מפתח תכונה לא תקין"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "רווח לא תקין במפתח תכונה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "ערכי תכונות מתחילים או מסתיימים ברווח"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "בדוק מפתחות תכונות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10369,74 +10442,84 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "הוסף מקור חדש לרשימה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "ערוך את המקור הנבחר"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "מקורות נתונים"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "בדוק ערכי תכונות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "השתמש בברירת המחדל לקובץ הנתונים (מומלץ)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "השתמש בברירת המחדל לקובץ בודק האיות"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "השתמש בברירת המחדל לקובץ הנתונים (מומלץ)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "השתמש בברירת המחדל לקובץ בודק האיות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "תקן תכונות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "לא יכול למצוא את סוג האלמנט"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "לא יכול למצוא את דרגת האזהרה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "ביטוי לא חוקי \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10581,7 +10664,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "בניין"
@@ -10595,5 +10678,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "שטח"
@@ -10603,25 +10686,25 @@
 msgstr "דרך לא סגורה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "דרכים לא מחוברות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "מבחן זה בודק אם לדרך יש נקודת קצה שקרובה מאוד לדרך אחרת."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "נקודת קצה של דרך נמצאת ליד דרך ראשית אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "נקודת קצה של דרך נמצאת ליד דרך אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "נקודת דרך נמצאת ליד דרך אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "נקודת קצה מחוברת של דרך נמצאת ליד דרך אחרת"
@@ -10644,17 +10727,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "דרכים ללא שמות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "ערוך צומת"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "דרכים ללא תוויות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "דרכים ריקות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "דרכים בנות נקודה אחת"
@@ -10692,14 +10780,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "אירעה שגיאה"
@@ -10797,5 +10885,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10808,117 +10896,106 @@
 msgstr "הורדה אוטומטית"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "הורד משטחים גלויים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "שנה רזולוציה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "טען מחדש משטחים פגומים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "שמור שכבת WMS לקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "טען שכבת WMS מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "שגיאה בפורמט קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "מאפייני תוסף WMS"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "שם תפריט"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "כתובת WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "שם תפריט (ברירת מחדל)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "כתובת WMS (ברירת מחדל)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "הזן שם תפריט וכתובת WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "העתק ברירת מחדל"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "בחר שורה להעתקה"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "הורד"
 
 #. *
@@ -11132,16 +11209,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11150,5 +11222,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11157,5 +11229,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11164,10 +11236,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -11964,4 +12036,64 @@
 msgstr "גישה"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "כן"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -11985,5 +12117,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "פרטי"
@@ -12031,5 +12163,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "יעד"
@@ -12066,5 +12198,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12083,4 +12215,28 @@
 msgid "agricultural"
 msgstr "חקלאי"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "לא"
 
 #: build/trans_presets.java:315
@@ -12296,6 +12452,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr ""
@@ -12321,6 +12477,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr ""
@@ -12346,6 +12502,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "ראשי"
@@ -12371,6 +12527,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "משני"
@@ -12384,5 +12540,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "שלישוני"
@@ -12400,5 +12556,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "מגורים"
@@ -12416,5 +12572,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "שירות"
@@ -12441,6 +12614,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "בנייה"
@@ -12490,5 +12663,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "כיכר"
@@ -13467,5 +13640,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "ביצה"
@@ -15196,27 +15369,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "ספורט"
@@ -18054,8 +18227,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "אופניים"
@@ -18124,8 +18297,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "רגל"
@@ -18151,5 +18324,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "רכבת תחתית"
@@ -18279,4 +18452,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18285,4 +18459,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18291,4 +18466,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18297,4 +18473,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18358,7 +18535,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "גשר"
@@ -18416,4 +18593,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18539,7 +18717,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18622,15 +18800,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "מיושן"
@@ -18672,5 +18850,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "סוס"
@@ -18880,11 +19058,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -18922,6 +19100,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "רחוב"
@@ -18977,7 +19155,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -19033,8 +19211,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr ""
@@ -19055,5 +19233,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19067,5 +19245,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19086,5 +19264,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr ""
@@ -19099,5 +19277,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19112,5 +19290,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "גדת נחל"
@@ -19124,5 +19302,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "זרם"
@@ -19136,5 +19314,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr ""
@@ -19162,5 +19340,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "אקוודוקט"
@@ -19328,13 +19506,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "מעשה אדם"
@@ -19396,7 +19574,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19419,10 +19597,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19442,7 +19620,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19450,8 +19631,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19496,6 +19681,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19509,5 +19694,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "מסוף"
@@ -19529,5 +19714,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19541,5 +19726,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19587,7 +19772,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr ""
@@ -19604,5 +19789,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "מסלול קל"
@@ -19617,5 +19802,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "מסלול בינוניים"
@@ -19630,5 +19815,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "מסלול מתקדמים"
@@ -19643,5 +19828,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19656,5 +19841,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19669,5 +19854,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "מסלול מתחילים"
@@ -19772,10 +19957,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "תחנת כח"
@@ -19789,5 +19974,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "מזח"
@@ -19801,5 +19986,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "צינור"
@@ -19927,12 +20112,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "פנאי"
@@ -19946,5 +20131,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr ""
@@ -20016,8 +20201,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20119,10 +20304,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20508,22 +20693,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20555,6 +20740,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20615,8 +20800,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "בריאות"
@@ -20969,26 +21154,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "חנות"
@@ -21060,8 +21245,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "מלון"
@@ -21211,9 +21396,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "תיירות"
@@ -21285,8 +21470,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "היסטורי"
@@ -21357,8 +21542,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "ירוק"
@@ -21372,5 +21557,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "מחצבה"
@@ -21384,5 +21569,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr ""
@@ -21404,5 +21589,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr ""
@@ -21416,5 +21601,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "יער"
@@ -21428,5 +21613,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21449,5 +21634,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "קמעוני"
@@ -21461,5 +21646,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "תעשייתי"
@@ -21473,5 +21658,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21485,5 +21670,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21497,5 +21682,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21552,7 +21737,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "צבאי"
@@ -21566,5 +21751,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "בית עלמין"
@@ -21577,5 +21762,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "פיסגה"
@@ -21590,5 +21775,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "קרחון"
@@ -21602,5 +21787,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "הר געש"
@@ -21655,8 +21840,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "טבעי"
@@ -21670,5 +21855,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr ""
@@ -21682,5 +21867,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr ""
@@ -21694,5 +21879,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr ""
@@ -21706,5 +21891,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "בוץ"
@@ -21718,5 +21903,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "חוף"
@@ -21794,8 +21979,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr ""
@@ -21843,7 +22028,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "גבול"
@@ -21985,10 +22170,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "מקום"
@@ -22036,6 +22221,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "כתובת"
@@ -22266,10 +22451,10 @@
 msgstr ""
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr ""
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22277,5 +22462,5 @@
 msgstr ""
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22283,76 +22468,74 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr ""
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "נתוני OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr ""
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "שביל אופניים"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr ""
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr ""
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr ""
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "נא לבחור לפחות נקודה, דרך או יחס אחד. רק לאלמנטים שכבר הועלו יש היסטוריה."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "ביטול מחיקת דרך..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "בודק האם נקודה {0} נעלמה..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "ביטול מחיקת יחס..."
-
-#~ msgid "Keep mine"
-#~ msgstr "שמור את שלי"
-
-#~ msgid "Delete mine"
-#~ msgstr "מחק את שלי"
-
-#~ msgid "Selection too big"
-#~ msgstr "בחירה גדולה מידי"
+#~ msgid "Data Layer"
+#~ msgstr "שכבת נתונים"
+
+#~ msgid "Change"
+#~ msgstr "שנה"
+
+#~ msgid "Rotate"
+#~ msgstr "סובב"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "התנגשויות: {0}"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "ייבא קובץ TCX..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "ייבא קובץ TCX כמסלולי GPS"
 
 #~ msgid "Uploading data"
 #~ msgstr "מעלה נתונים"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "עדיין לא הוטמע."
+
 #~ msgid "Email"
 #~ msgstr "דוא\"ל"
@@ -22360,4 +22543,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "פתור התנגשויות"
+
+#~ msgid "Object"
+#~ msgstr "פריט"
 
 #~ msgid "{0} object has conflicts:"
@@ -22398,4 +22584,13 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "פתור {0} התנגשויות ב{1} עצמים"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "לחץ \"טען מחדש\" כדי לרענן את הרשימה"
+
+#~ msgid "Revert"
+#~ msgstr "להחזיר לקדמותו"
+
+#~ msgid "Date"
+#~ msgstr "תאריך"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22471,5 +22666,29 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "נא לבחור לפחות נקודה, דרך או יחס אחד. רק לאלמנטים שכבר הועלו יש היסטוריה."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?"
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "ביטול מחיקת דרך..."
+
+#~ msgid "Checking whether node {0} is gone ..."
+#~ msgstr "בודק האם נקודה {0} נעלמה..."
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "ביטול מחיקת יחס..."
+
+#~ msgid "Keep mine"
+#~ msgstr "שמור את שלי"
+
+#~ msgid "Delete mine"
+#~ msgstr "מחק את שלי"
+
+#~ msgid "Selection too big"
+#~ msgstr "בחירה גדולה מידי"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 16400)
+++ applications/editors/josm/i18n/po/is.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-26 20:33+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-06 08:09+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:19+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,31 @@
 msgstr "Hjálp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Óvistaðar breytingar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Það eru óvistaðar breytingar. Hunsa þær og loka forritinu?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Vista og hætta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Hunsa og hætta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +69,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +88,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +99,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Um JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Sýna upplýsingar um JOSM."
@@ -131,10 +132,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,25 +143,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Útgáfa {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Síðast breytt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java útgáfa {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Vefsíða."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Villutilkynningar"
@@ -170,5 +172,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +178,27 @@
 msgstr "Upplýsingar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Lestu mig"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Útgáfa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Höfundar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Viðbætur"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Um JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Skrá fannst ekki."
@@ -210,12 +212,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Vinsamlegast veldu a.m.k. þrjá hnúta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr ""
@@ -270,5 +271,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Breiddargráða"
@@ -277,5 +278,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Lengdargráða"
@@ -283,5 +284,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Raða hnútum í hring"
@@ -294,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -380,7 +381,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Vensl rekast á"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -389,37 +389,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "gögnum"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "lagi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "árekstri"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "niðurhali"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Þysja að {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Þysja að {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -429,9 +429,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Ekkert er valið til að þysja að."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr ""
@@ -525,20 +525,22 @@
 msgstr "Veldu eithvað til að afrita"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Búa til hring"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 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:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 
@@ -546,16 +548,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Fjarlægja"
@@ -605,5 +608,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -708,11 +711,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -723,5 +727,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Villa"
@@ -731,50 +735,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM vefhjálp"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Opna í vafra"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Breyta"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+msgstr "Endurhlaða"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -789,18 +793,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Sýna sögu OSM hnúta eða vega."
+msgstr "Sýna breytingarskrá þessa hluts á OpenStreetMap vefnum"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Breytingaskrá hluts"
+msgstr "Upplýsingar um hlut"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Sýna sögu OSM hnúta eða vega."
+msgstr "Sýna upplýsingar um þennan hlut á OpenStreetMap vefnum"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -861,5 +862,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Spegla"
@@ -898,16 +899,16 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#, java-format
+msgid "Move {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
-msgid "Move {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
-#, java-format
 msgid "Moves Objects {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr ""
@@ -1098,5 +1099,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1104,26 +1105,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Tómt skjal"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Árekstrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1131,36 +1131,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Vista OSM skrá"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Vista GPX skrá"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Óþekkt skráarending"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1211,6 +1211,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Loka"
@@ -1448,68 +1449,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Upphala til OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Upphala öllum breytingum á OSM þjóninn."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Hlutum sem verður bætt við:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Hlutum sem verður breytt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Hlutum sem verður eytt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Bættu við stuttri umsögn um þær breytingar sem þú ert að hlaða upp:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Hlaða upp breytingum?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Hlaða upp breytingum"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Það eru óleystir breytingarárekstrar. Þú verður að leysa þá fyrst."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Engar  breytingar til að hlaða upp."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1523,17 +1524,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1544,10 +1545,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1557,9 +1558,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1569,18 +1570,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1685,24 +1686,15 @@
 msgstr "GPS gögn"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Sæki gögn"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Gagnalag {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap gögn"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Gagnalag"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1744,5 +1736,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1843,5 +1835,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -1852,5 +1844,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -1866,7 +1858,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1874,9 +1866,9 @@
 msgstr "Val"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Velja, færa og snúa hlutum"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1885,10 +1877,33 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Mælingar"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Færa upp"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Afturkalla"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1905,5 +1920,5 @@
 msgstr "Þysja og hliðra korti"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2168,35 +2183,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Bæta við"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, java-format
+msgid "Add {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Breyta {0} hlut"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2206,19 +2213,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2226,25 +2240,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Vensl rekast á"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2255,11 +2269,11 @@
 "Eyða úr venslunum?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Fjarlægja úr venslum"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2268,10 +2282,10 @@
 msgstr "Valið „{0}“ er notað af venslunum „{1}“."
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr ""
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2283,20 +2297,20 @@
 "verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2322,9 +2336,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid "removing reference from relation {0}"
-msgstr "fjarlæga úr vali"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
@@ -2332,33 +2346,39 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#, java-format
+msgid "RemoveRelationMember {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:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2454,25 +2474,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "A"
@@ -2483,5 +2529,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2501,10 +2547,10 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 msgid "nodes"
-msgstr ""
+msgstr "hnútar"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2603,17 +2649,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2621,16 +2663,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2642,127 +2673,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Óþekkt hlutverk \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgid "No \"from\" way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
-msgid "No \"from\" way found."
+msgid "No \"to\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr ""
@@ -2770,5 +2801,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2796,6 +2827,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "bakgrunnur"
@@ -2805,19 +2836,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2828,30 +2849,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Hnútur {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2863,14 +2878,14 @@
 msgstr "Gat ekki skrifað bókamerki."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Ekki var hægt að ná í skilaboð dagsins"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -3026,5 +3041,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
-msgstr ""
+msgstr "Hleð inn viðbótum"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
@@ -3055,5 +3070,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3115,5 +3129,5 @@
 msgstr "Þysja út"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skali"
@@ -3147,7 +3161,12 @@
 msgstr "(enginn hlutur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
 msgstr ""
 
@@ -3156,9 +3175,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Skrá fannst ekki"
@@ -3218,4 +3237,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3225,10 +3245,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
-msgstr ""
+msgstr "Hnútar"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Stök"
@@ -3424,7 +3447,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3504,4 +3527,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3509,4 +3535,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3516,4 +3543,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3629,7 +3657,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Sláðu inn nafn fyrir staðsetningu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3702,7 +3729,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "fjarlæga úr vali"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3713,9 +3739,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Hlutverk"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3733,4 +3761,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3754,8 +3784,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3766,7 +3796,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3822,5 +3853,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Skipanasaga"
@@ -3831,6 +3862,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3841,5 +3872,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3848,10 +3879,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Skipanasaga: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Árekstrar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Breytingarárekstrar."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Leysa"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3859,26 +3907,4 @@
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Leysa"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Árekstrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Breytingarárekstrar."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Árekstrar: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -3915,43 +3941,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Breytingaskrá"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Sýna breytingarsögu valdra hluta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr "Næ í breytingaskrá fyrir {0} með kennið {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Afturkalla"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Óútfært."
+msgstr "Endurhlaða breytingaskrálistann með núverandi vali."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Sýna"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr "Sýna breytingasögu valdra hluta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4084,4 +4115,18 @@
 msgid "Add Properties"
 msgstr "Bæti vað eigindum"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Bæta við"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4194,9 +4239,9 @@
 msgstr "Val: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Opna þessa stiku sem glugga"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4205,5 +4250,5 @@
 "vinstri tólastikunni."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Smelltu til að minnka/hámarka innihald stikunnar"
@@ -4233,179 +4278,101 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Vista breytingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Gengt af"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Eigindi (tómt gildi eyðir eigindunum)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Færa valda meðlimi upp"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Bæta við vali"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Bæta völdum hlutum við venslin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Fjarlægja val"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Íþróttir"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+msgid "Sort the selected relation members or the whole list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Færa valda meðlimi niður"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Fjarlægja val úr venslunum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Niðurhala meðlimum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hala niður öllum nóðum og vegum í þessum venslum"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "já"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "nei"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Stök: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4440,21 +4407,21 @@
 msgstr "Veldu fyrst bókmerki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "Minnsta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "Minnsta lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "Mesta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "Mesta lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4464,5 +4431,5 @@
 "svæðinu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Afmarkað svæði"
@@ -4611,653 +4578,41 @@
 msgstr "Reitnúmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Les {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Samstilla klukkur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG myndir (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Sérsníða teikningu lína"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Sérsníða liti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "Í lagi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Veldu lit"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Flytja inn hljóð"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Flytja inn myndir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} ferill, "
-msgstr[1] "{0} ferlar, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} leið, "
-msgstr[1] "{0} leiðir, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punktur"
-msgstr[1] "{0} punktar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Tímaspan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Lengd: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Breyta í gagnalag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "Tölfræði um {0}:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Breyta í GPX-lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "gps punktur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "punktur"
-msgstr[1] "punktar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Litur"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "Breytingaskrá: {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Hnútur {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -5967,5 +5322,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6116,40 +5472,714 @@
 msgstr "Heiti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Útgáfa {0} búin til {1} af {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Útgáfa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Les {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Samstilla klukkur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG myndir (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Sérsníða teikningu lína"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Sérsníða liti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "Í lagi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Veldu lit"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Flytja inn hljóð"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Flytja inn myndir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} ferill, "
+msgstr[1] "{0} ferlar, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} leið, "
+msgstr[1] "{0} leiðir, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punktur"
+msgstr[1] "{0} punktar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Tímaspan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Lengd: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Breyta í gagnalag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Gagnalag {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "útgáfa {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "Tölfræði um {0}:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "API útgáfa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Breyta í GPX-lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "gps punktur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "punktur"
+msgstr[1] "punktar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Litur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Lag: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Litir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6158,29 +6188,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Aldrei"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Teikna stóra GPS punkta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hraði (rauður = hægari, grænn = hraðari)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -6188,5 +6218,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6207,5 +6237,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6243,5 +6273,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6254,50 +6284,50 @@
 msgstr "Fótgangandi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Teikna línu á milli GPS punkta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6305,9 +6335,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6316,25 +6346,25 @@
 "þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Hámarkslengt milli punkta (í metrum)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6342,13 +6372,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6356,9 +6386,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6366,136 +6396,155 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM gögn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr ""
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Sýna kenni hluta í vallistum"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Útlit og viðmót"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Tungumál"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+msgid "Enable built-in icon defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Stillingar fyrir viðbætur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Uppfæra"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr ""
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Birtingarstillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6503,99 +6552,99 @@
 msgstr "Stillingar sem hafa áhrif á útlit forritsins"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Tengistillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Stillingar sem þarf til að tengjast OSM þjóninum."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Kortastillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Stillingar tengdar kortavörpun og gagnatúlkun."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Hljóðstillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 "Athugið að stundum þarf að endurræsa JOSM til að stillingar taki gildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Sýna hnit sem"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Vörpun"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Kortavörpun"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Vörpun"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Sýna hnit sem"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Nota milliþjón"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Nafnlaust"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Stillingar milliþjóns"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Nafn milliþjóns"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Port á milliþjóni"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Notandanafn á milliþjóni"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Lykilorð á milliþjóni"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Slóð OSM þjóns"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6610,75 +6659,106 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr ""
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Flýtileið"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Nánari lýsing"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Lag: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Notandi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Viðvörun: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Útgáfa {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+msgid "Copy defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+msgid "Add a new XML source to the list."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Forstillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Tækjaslá"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Tækjaslá"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Breyta íhlutum tækjasláarinnar"
@@ -6928,6 +7008,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7251,5 +7331,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7259,15 +7339,15 @@
 msgstr "{0}% ({1}/{2}), {3} búið. Hleð upp: {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Uppfæra viðbætur"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7280,5 +7360,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7287,23 +7367,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7349,6 +7429,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Gera viðbótina óvirka"
@@ -7363,5 +7443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7369,5 +7449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7375,19 +7455,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7395,5 +7475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7401,19 +7481,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Upplýsingar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7422,13 +7502,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7441,9 +7521,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7453,6 +7533,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7475,14 +7555,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Útgáfa {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7739,45 +7819,45 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7976,20 +8056,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -7997,13 +8077,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8025,5 +8105,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -8357,5 +8437,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Tómt lag"
@@ -8469,4 +8549,9 @@
 msgstr ""
 
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
+#, fuzzy
+msgid "TCX Files (*.tcx)"
+msgstr "GPX skrár (*.gpx *.gpx.gz)"
+
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
@@ -8490,5 +8575,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8509,11 +8594,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8522,6 +8607,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr ""
@@ -8584,6 +8669,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Uppfæra"
@@ -8889,7 +8974,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "vatn"
@@ -9218,14 +9303,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugs pöddur"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9351,19 +9436,19 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9487,7 +9572,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Hleð upp gögnum..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9675,13 +9759,4 @@
 #: ../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 ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
 msgstr ""
 
@@ -9891,33 +9966,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10223,23 +10298,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10248,5 +10323,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10254,78 +10329,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10333,74 +10408,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+msgid "Use default tag ignore file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+msgid "Use the default tag ignore file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10545,7 +10628,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "bygging"
@@ -10559,5 +10642,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr ""
@@ -10567,25 +10650,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10608,17 +10691,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Ónefndir vegir"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+msgid "Unnamed Junction"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Vegir án eiginda"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr ""
@@ -10656,14 +10743,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr ""
@@ -10761,5 +10848,5 @@
 msgstr "Leiðrétta stöðu WMS lagsins sem nú er valið"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10772,117 +10859,106 @@
 msgstr "Sjálfvirkt niðurhal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Niðurhala sýnilega reiti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Breyta upplausn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Vista WMS lag í skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "WMS Plugin Preferences"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "WMS Plugin Preferences"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
+msgid "Menu Name"
 msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
-msgid "Menu Name"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+msgid "WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "Menu Name (Default)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "WMS URL (Default)"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
-msgid "WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "Menu Name (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "WMS URL (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Niðurhala"
 
 #. *
@@ -11094,16 +11170,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11112,5 +11183,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11119,5 +11190,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11126,10 +11197,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -11926,4 +11997,64 @@
 msgstr "Aðgangur"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "já"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -11947,5 +12078,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr ""
@@ -11993,5 +12124,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr ""
@@ -12028,5 +12159,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12045,4 +12176,28 @@
 msgid "agricultural"
 msgstr ""
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "nei"
 
 #: build/trans_presets.java:315
@@ -12258,6 +12413,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "hraðbraut"
@@ -12283,6 +12438,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "stofnvegur"
@@ -12308,6 +12463,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr ""
@@ -12333,6 +12488,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr ""
@@ -12346,5 +12501,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr ""
@@ -12362,5 +12517,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "íbúðargata"
@@ -12378,5 +12533,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12403,6 +12575,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "byggingarsvæði"
@@ -12452,5 +12624,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "hringtorg"
@@ -13429,5 +13601,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr ""
@@ -15158,27 +15330,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "íþrótt"
@@ -18016,8 +18188,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "hjól"
@@ -18086,8 +18258,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "fótgangandi"
@@ -18113,5 +18285,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr ""
@@ -18241,4 +18413,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18247,4 +18420,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18253,4 +18427,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18259,4 +18434,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18320,7 +18496,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "brú"
@@ -18378,4 +18554,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18501,7 +18678,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18584,15 +18761,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr ""
@@ -18634,5 +18811,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr ""
@@ -18842,11 +19019,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -18884,6 +19061,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "stræti"
@@ -18939,7 +19116,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -18995,8 +19172,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr ""
@@ -19017,5 +19194,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19029,5 +19206,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19048,5 +19225,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "beygjuhringur"
@@ -19061,5 +19238,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19074,5 +19251,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "árbakki"
@@ -19086,5 +19263,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "lækur"
@@ -19098,5 +19275,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr ""
@@ -19124,5 +19301,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr ""
@@ -19290,13 +19467,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr ""
@@ -19358,7 +19535,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19381,10 +19558,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19404,7 +19581,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19412,8 +19592,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19458,6 +19642,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19471,5 +19655,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr ""
@@ -19491,5 +19675,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19503,5 +19687,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19549,7 +19733,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "skíðalyfta"
@@ -19566,5 +19750,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19579,5 +19763,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19592,5 +19776,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19605,5 +19789,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19618,5 +19802,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19631,5 +19815,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -19734,10 +19918,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19751,5 +19935,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "bryggja"
@@ -19763,5 +19947,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "leiðsla"
@@ -19889,12 +20073,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "frístundir"
@@ -19908,5 +20092,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "smábátahöfn"
@@ -19978,8 +20162,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20081,10 +20265,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20470,22 +20654,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20517,6 +20701,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20577,8 +20761,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr ""
@@ -20931,26 +21115,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr ""
@@ -21022,8 +21206,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hótel"
@@ -21173,9 +21357,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "ferðamennska"
@@ -21247,8 +21431,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr ""
@@ -21319,8 +21503,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21334,5 +21518,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr ""
@@ -21346,5 +21530,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr ""
@@ -21366,5 +21550,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr ""
@@ -21378,5 +21562,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "skógur (ræktaður)"
@@ -21390,5 +21574,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21411,5 +21595,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "smásala"
@@ -21423,5 +21607,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "iðnaður"
@@ -21435,5 +21619,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21447,5 +21631,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21459,5 +21643,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21514,7 +21698,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr ""
@@ -21528,5 +21712,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr ""
@@ -21539,5 +21723,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "tindur"
@@ -21552,5 +21736,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "jökul"
@@ -21564,5 +21748,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "eldfjall"
@@ -21617,8 +21801,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr ""
@@ -21632,5 +21816,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr ""
@@ -21644,5 +21828,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr ""
@@ -21656,5 +21840,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "skógur"
@@ -21668,5 +21852,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "leðja"
@@ -21680,5 +21864,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "strönd"
@@ -21756,8 +21940,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr ""
@@ -21805,7 +21989,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr ""
@@ -21947,10 +22131,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr ""
@@ -21998,6 +22182,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr ""
@@ -22228,10 +22412,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr ""
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22239,5 +22423,5 @@
 msgstr ""
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22245,51 +22429,58 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr ""
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap gögn"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr ""
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Hjólastígur"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr ""
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr ""
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr ""
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Gagnalag"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Árekstrar: {0}"
+
 #~ msgid "Uploading data"
 #~ msgstr "Hleð upp gögnum"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Óútfært."
 
 #~ msgid "Email"
@@ -22309,4 +22500,7 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Leysa {0} árekstra í {1} hlutum"
+
+#~ msgid "Revert"
+#~ msgstr "Afturkalla"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 16400)
+++ applications/editors/josm/i18n/po/it.po	(revision 16407)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-22 07:21+0000\n"
-"Last-Translator: Cristian Testa <testa.cristian@tiscali.it>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-08 07:54+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,8 +13,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -22,6 +22,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -29,11 +29,12 @@
 msgstr "Aiuto"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 "La proiezione non può essere letta dalle preferenze. Verrà utilizzata quella "
 "di Mercatore"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -41,23 +42,23 @@
 "server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Modifiche non salvate"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr ""
 "Ci sono delle modifiche non salvate. Abbandonare le modifiche e continuare?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Salva ed Esci"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Annulla ed Esci"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -70,12 +71,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -89,7 +90,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -100,32 +101,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "SCONOSCIUTO"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Informazioni su JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Mostra le informazioni sul programma."
@@ -133,10 +134,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -144,25 +145,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versione {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Ultima modifica {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java versione {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Pagina iniziale"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Segnalazione errori"
@@ -172,5 +174,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -178,27 +180,27 @@
 msgstr "Informazioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Leggimi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revisione"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Contributi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Estensioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Informazioni su JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Impossibile trovare il file."
@@ -212,12 +214,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Selezionare almeno un nodo o percorso."
+msgstr "Selezionare almeno un nodo, percorso o relazione già caricato."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Attenzione"
@@ -272,5 +273,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Latitudine"
@@ -279,5 +280,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Longitudine"
@@ -285,5 +286,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Disponi i nodi in cerchio"
@@ -296,5 +297,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -353,4 +354,6 @@
 "{0}, max is {1}"
 msgstr ""
+"Il numero di cambiamenti corrente supera il numero massimo consentito, ora "
+"sono {0}, il massimo è {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
@@ -361,10 +364,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Non inizializzato"
+msgstr "Inizializzazione delle API fallita"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -383,7 +385,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Conflitto tra relazioni"
+msgstr "Violazione della precondizione"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -391,38 +392,40 @@
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+"{0} nodi nel percorso {1} superano il massimo consentito. numero di nodi "
+"permesso {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflitto"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "scarica"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Fa lo zoom della vista a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -432,9 +435,9 @@
 msgstr "Visualizza: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Nessuna selezione da ingrandire"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Nessun conflitto da ingrandire"
@@ -528,39 +531,43 @@
 msgstr "Seleziona qualcosa da copiare."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Crea cerchio"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 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:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr "Questi nodi non sono disposti in cerchio"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 "Seleziona esattamente tre nodi oppure un percorso formato esattamente da tre "
 "nodi."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "Questi nodi non sono disposti in cerchio"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Cancella"
@@ -610,5 +617,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -717,11 +724,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -732,5 +740,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Errore"
@@ -740,30 +748,30 @@
 msgstr "Scegliere una licenza predefinita"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "Guida in linea di JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Apri nel Browser"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -771,20 +779,20 @@
 msgstr "Ricarica"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr ""
 "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Errore durante il caricamento della pagina {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Pagina di help mancante. Creala in <A HREF=\"{0}\">italiano</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -792,4 +800,6 @@
 "\">your language</A>."
 msgstr ""
+"Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">inglese</A> oppure <A "
+"HREF=\"{1}\">nella propria lingua</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
@@ -799,18 +809,17 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Mostra la cronologia di percorsi e nodi in OSM"
+msgstr ""
+"Visualizza le informazioni dello storico OSM su percorsi, nodi o relazioni."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Storico dell'elemento"
+msgstr "Informazioni riguardanti l'elemento"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Mostra la cronologia di percorsi e nodi in OSM"
+msgstr ""
+"Visualizza le informazioni dell'oggetto OSM su nodi, percorsi o relazioni."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -870,5 +879,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Rispecchia"
@@ -907,10 +916,10 @@
 msgstr "destra"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Muovi {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -918,5 +927,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Impossibile spostare degli oggetti fuori dal mondo."
@@ -1112,5 +1121,5 @@
 msgstr "Il file {0} esiste. Sovrascrivere?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1120,26 +1129,25 @@
 "questo come bug."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Documento vuoto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Il documento non contiene dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Salva comunque"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1149,36 +1157,36 @@
 "gestiti come se si fossero stati tutti rifiutati. Continuare?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Rifiuta i conflitti e Salva"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Salva file OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Salva in un file GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Salva livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Impossibile creare una copia di backup."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "L'estensione del file è sconosciuta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Si è verificato un errore durante il salvataggio."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Errore durante il ripristino di un file di backup."
@@ -1231,6 +1239,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Chiudi"
@@ -1302,12 +1311,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"L'appartenenza ad una relazione basata su regole è stata copiata a tutti i "
-"nuovi percorsi.\n"
-"Controllare ed eventualmente correggere."
+"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:319
@@ -1462,5 +1469,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
 msgid "Failed to update the selected primitives."
-msgstr ""
+msgstr "E' fallito il tentativo di aggiornare le primitive selezionate."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
@@ -1472,8 +1479,10 @@
 msgid "Could not find primitive with id {0} in the current dataset"
 msgstr ""
+"Non è possibile trovare la primitiva con identificativo {0} nell'insieme di "
+"dati locale corrente"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
 msgid "Missing primitive"
-msgstr ""
+msgstr "Primitiva mancante"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
@@ -1484,9 +1493,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
 msgid "Updates the currently selected primitives from the server"
-msgstr ""
+msgstr "Aggiorna le primitive attualmente selezionate dal server"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
 msgid "There are no selected primitives to update."
-msgstr ""
+msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
@@ -1494,68 +1503,68 @@
 msgstr "Selezione vuota"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Carica su OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Carica tutti i cambiamenti sul server OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Oggetti da aggiungere:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Oggetti da modificare:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Oggetti da eliminare:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Crea un breve commento ai cambiamenti che sta caricando:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Caricare questi cambiamenti?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Carica le modifiche"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Niente da caricare. Prima è necessario ottenere dei dati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Ci sono dei conflitti non risolti. Prima è necessario risolverli."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Nessun cambiamento da caricare."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Invio in corso"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+msgstr "Aggiornamento della primitiva"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+msgstr "Sincronizza solamente {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Sincronizza l'intero dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1568,18 +1577,27 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+"<html>Caricamento <strong>fallito</strong> perché il server possiede una "
+"versione più recente di uno<br>dei tuoi nodi, percorsi, o relazioni.<br>Il "
+"conflitto è stato causato da <strong>{0}</strong> con identificativo <strong>"
+"{1}</strong>,<br>il server possiede la versione {2}, la tua versione è {3}."
+"<br><br>Cliccare <strong>{4}</strong> per sincronizzare solamente la "
+"primitiva che causa il conflitto.<br>Cliccare <strong>{5}</strong> per "
+"sincronizzare tutto l''insieme di dati locale con il server.<br>Cliccare "
+"<strong>{6}</strong> per annullare e continuare ad apportare delle modifiche."
+"<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Rilevato un conflitto"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Valore di ritorno inatteso. Ottenuto {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1589,11 +1607,16 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+"<html>Caricamento <strong>fallito</strong> perché il server possiede una "
+"versione più recente di uno<br>dei tuoi nodi, percorsi, o relazioni."
+"<br><br>Cliccare <strong>{0}</strong> per sincronizzare tutto l''insieme di "
+"dati locale con il server.<br>Cliccare <strong>{1}</strong> per annullare e "
+"continuare ad apportare delle modifiche.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1603,9 +1626,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+msgstr "Violazione della precondizione"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1615,18 +1638,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+msgstr "Primitiva già eliminata"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "Invio alle API di OSM fallito"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1735,25 +1758,16 @@
 msgstr "Dati GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Scaricamento dei dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Nessun dato importato."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Livello dati {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Dati OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Livello dati"
-
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
 #, java-format
@@ -1764,4 +1778,5 @@
 msgid "The following errors occurred during mass download:"
 msgstr ""
+"Sono stati generati i seguenti errori durante lo scaricamento di massa:"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
@@ -1781,5 +1796,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
 msgid "Deleted or moved primitives"
-msgstr ""
+msgstr "Primitive eliminate o spostate"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1794,5 +1809,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1896,5 +1911,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -1909,5 +1924,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Rilascia il bottone del mouse per interrompere la rotazione."
@@ -1928,7 +1943,7 @@
 "quel punto."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1936,9 +1951,9 @@
 msgstr "Seleziona"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Seleziona, muovi e ruota gli oggetti."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1947,5 +1962,28 @@
 msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Sposta a sinistra"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Sposta a sinistra"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Annulla"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1954,5 +1992,5 @@
 "più vicino."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1972,5 +2010,5 @@
 msgstr "Ridimensiona e muovi la mappa"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2255,35 +2293,27 @@
 msgstr "Errore durante la comunicazione con il server"
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Aggiungi"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Cambia"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Cancella {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Modifica {0} oggetto"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Rimuovi \"{0}\" per {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Imposta {0}={1} per {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2293,19 +2323,26 @@
 msgstr[1] "oggetti"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Rimuovi \"{0}\" per {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Imposta {0}={1} per {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
 msgstr "CambiaRuoloMembroRelazione"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2313,25 +2350,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr "non è possibile risolvere il conflitto irrisolto"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Cancella {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Cancella {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Conflitto tra relazioni"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2342,11 +2379,11 @@
 "Cancellare dalla relazione?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2357,10 +2394,10 @@
 "Cancellare dalla relazione?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Dividi il segmento del percorso"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2372,20 +2409,20 @@
 "(che non puoi vedere).<br>Vuoi veramente cancellarli?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "Risolvi conflitti nello stato eliminato in {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Sposta"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2401,5 +2438,5 @@
 #, java-format
 msgid "removing reference from way {0}"
-msgstr ""
+msgstr "rimozione del riferimento dal percorso {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
@@ -2411,44 +2448,52 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "Sono stati rimossi elementi dalle Relazioni"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "Rimuovi un membro dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Ruota"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Cancella {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sequenza"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+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:52
+#: ../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
+#, fuzzy
+msgid "Main.ds doesn't include node {0}"
+msgstr ""
+"L''insieme di dati personale non include una etichetta con la chiave {0}"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2548,25 +2593,51 @@
 msgstr "Impossibile scaricare le preferenze dal server."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "E"
@@ -2577,5 +2648,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2600,5 +2671,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2627,9 +2698,9 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "changeset"
-msgstr ""
+msgstr "gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "changesets"
-msgstr ""
+msgstr "gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
@@ -2677,10 +2748,10 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153
 msgid "There's no primitive with version {0} in this history"
-msgstr ""
+msgstr "non c'è alcuna primitiva con versione {0} in questo storico"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162
 msgid "There's no version valid at date ''{0}'' in this history"
-msgstr ""
+msgstr "Non c'è alcuna versione valida alla data ''{0}'' in questo storico"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173
@@ -2697,17 +2768,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2715,16 +2782,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2736,127 +2792,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Il percorso dello stile dell''area non è chiuso."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "il percorso multi-poligonale ''{0}'' non è chiuso."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Eliminato il membro ''{0}'' nella relazione."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Percorso ''{0}'' con meno di due punti."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 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:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 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:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "E' stata trovata più di una \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ruolo ''{0}'' sconosciuto."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, 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:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Non è stato trovato un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Non è stato trovato un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 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:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Non è stato trovato lo stile per la restrizione {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Regola ''{0}'' non utile per il percorso ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-percorso ''{0}'' nel multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Nessun percorso esterno per il multi-poligono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Il percorso interno ''{0}'' è esterno."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Lo stile per il percorso esterno ''{0}'' è discordante."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "senza etichetta"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "testo"
@@ -2864,5 +2920,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2890,6 +2946,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "sfondo"
@@ -2899,24 +2955,9 @@
 msgstr "evidenzia"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"La proiezione \"{0}\" è progettata solo per \n"
-"latitudini comprese tra 46.1° e 57°.\n"
-"Usa un altro sistema di proiezione se non stai usando\n"
-"un server WMS francese.\n"
-"Non caricarire nessun dato dopo questo messaggio."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2932,36 +2973,24 @@
 "e crea un nuovo layer sulla nuova zona."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Zona di Lambert (Francia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona di Lambert (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"La proiezione \"{0}\" è progettata solamente per\n"
-"latitudini comprese fra 45.7° e 47.9\n"
-"e longitudini comprese fra 5.7° e 10.6°.\n"
-"Usa un altro sistema di proiezione se non stai lavorando\n"
-"su un set di dati relativo alla Svizzera od al Liechtenstein.\n"
-"Non caricare altri dati dopo questo messaggio."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grigliato svizzero (Svizzera)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Muovi {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2973,14 +3002,14 @@
 msgstr "Impossibile scrivere i segnalibri."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Il messaggio del giorno non è disponibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- la versione in esecuzione è {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Scaricamento del \"messaggio del giorno\""
@@ -3178,5 +3207,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3238,5 +3266,5 @@
 msgstr "Riduci"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "scala"
@@ -3270,8 +3298,13 @@
 msgstr "(nessun oggetto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "livello non in lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3279,9 +3312,9 @@
 msgstr "Connessione al server OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Impossibile interpretare"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "File non trovato"
@@ -3342,4 +3375,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3349,4 +3383,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "Nodi"
@@ -3354,5 +3390,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Membri"
@@ -3570,7 +3607,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3654,4 +3691,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3659,4 +3699,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3668,4 +3709,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3689,14 +3731,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Errore durante la comunicazione con il server"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Errore durante la comunicazione con il server."
+msgstr "Comunicazione con il server fallita"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3721,5 +3762,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
 msgid "Undelete additional nodes?"
-msgstr ""
+msgstr "Ripristina i nodi addizionali?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
@@ -3733,5 +3774,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
 msgid "Undelete dependent primitives?"
-msgstr ""
+msgstr "Ripristina le primitive dipendenti?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
@@ -3759,7 +3800,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
-#, fuzzy
 msgid "Visible State:"
-msgstr "Stato eliminato:"
+msgstr "Stato visibile:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
@@ -3781,19 +3821,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
 msgid "visible (on the server)"
-msgstr ""
+msgstr "visibile (sul server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
 msgid "not visible (on the server)"
-msgstr ""
+msgstr "non visibile (sul server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Inserisci il nome della località."
+msgstr "Mantieni un clone della versione locale"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
-#, fuzzy
 msgid "Physically delete from local dataset"
-msgstr "Versione personale (insieme di dati locale)"
+msgstr "Elimina fisicamente dall'insieme di dati locale"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
@@ -3822,18 +3860,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
-#, fuzzy
 msgid "Keep my visible state"
-msgstr "Mantieni il mio stato eliminato"
+msgstr "Mantieni il mio stato visibile"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Si, ripristina anche questo"
+msgstr "Si, reimposta l'id"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Nessuna data"
+msgstr "No, annulla"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3847,10 +3882,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Reimposta l'id a 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
-#, fuzzy
 msgid "Keep their visible state"
-msgstr "Mantieni il loro stato eliminato"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
@@ -3866,21 +3900,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "Rimuovi dalla selezione"
+msgstr "Elimina dall'insieme di dati"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
-#, fuzzy
 msgid "Undecide conflict between visible state"
-msgstr "Marca come irrisolto il conflitto tra stati eliminati"
+msgstr ""
 
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Ruolo"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitiva"
@@ -3900,4 +3934,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<indefinito>"
@@ -3923,8 +3959,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3935,7 +3971,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3993,5 +4030,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Lista delle operazioni"
@@ -4003,6 +4040,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -4013,5 +4050,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -4020,10 +4057,29 @@
 msgstr "Abilita/disabilita: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Pila dei comandi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Conflitto"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Unisci i conflitti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Risolvi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Apre una finestra per unire tutti gli elementi selezionati nella lista qui "
+"sopra."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -4032,28 +4088,4 @@
 msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Risolvi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Apre una finestra per unire tutti gli elementi selezionati nella lista qui "
-"sopra."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Conflitto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Unisci i conflitti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Conflitti: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -4093,45 +4125,48 @@
 "strong> per ritornare alla risoluzione dei conflitti.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Fare clic su Ricarica per aggiornare la lista"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Cronologia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Visualizza la cronologia di tutti gli oggetti selezionati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Oggetto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Data"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "Carica storico"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr "Caricamento dello storico per {0} con id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Carica nuovamente tutti gli oggetti selezionati e aggiorna la lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Ripristina"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-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."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Non ancora implementato."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Visualizza"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr "Visualizza lo storico della primitiva selezionata"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4264,4 +4299,18 @@
 msgid "Add Properties"
 msgstr "Aggiungi proprietà"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Aggiungi"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4374,9 +4423,9 @@
 msgstr "Selezione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Stacca il pannello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4385,5 +4434,5 @@
 "degli strumenti a sinistra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello"
@@ -4415,180 +4464,103 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Applica cambiamenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Di base"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Occupato da"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "collegato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Etichette (un valore vuoto cancella l'etichetta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Sposta in alto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Sposta in alto i membri attualmente selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Aggiungi la selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Aggiungi tutti gli oggetti selezionati come membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Elimina gli elementi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Rimuovi dalla relazione gli elementi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Elimina la sorgente selezionata nella lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Sposta in basso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Sposta in basso i membri attualmente selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 "Cancella il membro dalla riga della tabella utilizzata da questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Scarica i membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "si"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "no"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Membri: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editor relazione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Si sono verificati dei conflitti durante l'importazione."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Errore di scansione nella risposta del server."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Impossibile connettersi al server."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr "Errore durante la comunicazione con il server."
@@ -4623,21 +4595,21 @@
 msgstr "Per prima cosa, scegli un segnalibro."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "Lat min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "Lon min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "Lat max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "Lon max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4647,5 +4619,5 @@
 "indirizzo URL qui per scaricare l'area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Riquadro di selezione"
@@ -4796,693 +4768,41 @@
 msgstr "Numeri dei tasselli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Immagini per {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Leggi GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Non è stata trovata nessuna immagine con una data leggibile."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lettura di {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Immagini geoetichettate"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS inizio: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS fine: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "differenza attuale: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "differenza fuso orario: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "immagine"
-msgstr[1] "immagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} in questa traccia."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Sincronizza tempo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "Immagini JPEG (*.jpeg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Impossibile leggere la data nel file \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Immagine"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizza l'orario con l'unità GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Impossibile decodificare l'orario inserito."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "punto GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Personalizza disegno linee"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Usa le impostazioni globali."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Seleziona le opzioni per il disegno delle linee"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Personalizza colori"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predefinito"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Scegli un colore"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Crea marcatori dai punti con nome"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Nomina i punti del percorso da {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importa l'audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Files audio Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcatori audio da {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importa immagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} percorso, "
-msgstr[1] "{0} percorsi, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} percorso, "
-msgstr[1] "{0} percorsi, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punto del percorso"
-msgstr[1] "{0} punti del percorso"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrizione: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Timespan/Arco di tempo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Lunghezza: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Converti in livello dati"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Il caricamento di dati GPS non elaborati come dati di mappa è "
-"considerato dannoso.<br>Se si desidera caricare delle tracce, vedere qui:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Convertito da: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Scarica da OSM lungo questo tracciato"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Scarica tutto entro:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Area massima per richiesta:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km quadrati"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Questa azione richiederà {0} richieste di scarico distinte.<br>Si "
-"vuole procedere?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Alcuni punti del percorso con marcature temporali precedenti l'inizio o "
-"successivi alla fine del tracciato sono stati omessi o posizionati "
-"all'inizio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Sono stati esclusi alcuni punti del percorso che sono troppo lontani dal "
-"tracciato per poter essere giustamente calcolati."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "al di fuori dell'area scaricata"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "versione {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Attenzione: l'uso contemporaneo di dati nelle versioni 0.5 e 0.6 risulterà "
-"nella versione 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "Ci sono stati {0} conflitti durante l'importazione"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} è composto da:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} eliminati)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "disattiva"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "Versione delle API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Converti in un layer GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "traccia"
-msgstr[1] "tracce"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punto"
-msgstr[1] "punti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "una traccia con {0} punto"
-msgstr[1] "una traccia con {0} punti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} è composto da {1} traccia"
-msgstr[1] "{0} è composto da {1} tracce"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punto"
-msgstr[1] "{0} punti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "segnaposto gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "marcatore"
-msgstr[1] "marcatori"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} è composto da {1} marcatore"
-msgstr[1] "{0} è composto da {1} marcatori"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Sincronizza l'audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Audio sincronizzato al punto {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-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:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "Premi pausa nel punto del tracciato dove vuoi il marcatore"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Non ci sono marcatori audio in questo layer da compensare."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"E' necessario spostare la testina di riproduzione in prossimità del "
-"tracciato GPX a cui è associata la traccia audio che si vuole riprodurre "
-"(dopo il primo marcatore)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Sposta (premendo SHIFT) l'inizio dell'audio sopra un marcatore audio o sul "
-"tracciato da sincronizzare."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Impossibile creare un nuovo segnaposto Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Impossibile mostrare l'URL per questo marcatore"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Impossibile visualizzare l'URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Preferenze avanzate"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Impostazione diretta delle preferenze. Usare con cautela!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Cerca: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Il valore corrente è quello di default."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Il valore di default è ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Il valore di default è sconosciuto (l'impostazione non è stata ancora usata)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Scegli la riga da modificare."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Nuovo valore per {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Scegli la riga da cancellare."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Inserisci una nuova coppia chiave/valore"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Mostra il menu audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Marcatore di etichetta audio (e immagine e web)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Mostra la traccia audio attiva."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Crea marcatori non-audio quando leggi un file GPX."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Punti del percorso espliciti con data/ora valida."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-"Punti del percorso espliciti con ora stimata a partire dalla posizione del "
-"tracciato."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Punti del tracciato nominati."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Orari di modifica (marcatori temporali) dei file audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Partenza del tracciato (dovresti sempre eseguire questo se non ci sono altri "
-"marcatori disponibili)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Mostra o nascondi il menù audio nella barra del menù principale."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Mostra una icona di movimento che rappresenta il punto sul tracciato da "
-"sincronizzare dove la traccia audio attualmente utilizzata è stata "
-"registrata."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Inserisci il testo dell'etichetta (e dell'immagine e del web) rispetto al "
-"marcatore audio come icona del tasto."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Quando si apre un layer GPX crea automaticamente un marcatore sul livello "
-"per ogni punto del percorso."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Quando importi l'audio, crea marcatori da ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-"Quando si importa l'audio, applicalo ad ogni punto del percorso nel livello "
-"GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Crea automaticamente dei marcatori audio dai punti del tracciato (invece che "
-"dai punti del percorso espliciti) con i nomi o le descrizioni."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Crea i marcatori audio nella posizione del tracciato corrispondente "
-"all'orario di modifica di ogni file audio WAV importato."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Il numero di secondi da saltare in avanti o indietro quando il relativo "
-"bottone è schiacciato"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Avanti/indietro del tempo (in secondi)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Valore dell'aumento della velocità per l'avanzamento veloce"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Incrementazione dell'avanzamento veloce"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Richiesta di secondi di anticipo (o ritardo se il numero è negativo) nella "
-"traccia audio dalla posizione richiesta"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Tempo di rappresentazione (secondi)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-"Rapporto del tempo trascorso del registratore vocale con il vero tempo "
-"trascorso"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Calibrazione del registratore vocale"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Colore"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "Storico per {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "Chiudi la finestra"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Nodo {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6192,5 +5512,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6341,40 +5662,754 @@
 msgstr "Nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Versione {0} creata il {1} da {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Versione"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Immagini per {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Leggi GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Non è stata trovata nessuna immagine con una data leggibile."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lettura di {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Immagini geoetichettate"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS inizio: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS fine: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "differenza attuale: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "differenza fuso orario: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "immagine"
+msgstr[1] "immagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} in questa traccia."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Sincronizza tempo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "Immagini JPEG (*.jpeg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Impossibile leggere la data nel file \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Immagine"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizza l'orario con l'unità GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Impossibile decodificare l'orario inserito."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "punto GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Personalizza disegno linee"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Usa le impostazioni globali."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Seleziona le opzioni per il disegno delle linee"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Personalizza colori"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predefinito"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Scegli un colore"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Crea marcatori dai punti con nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Nomina i punti del percorso da {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importa l'audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Files audio Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcatori audio da {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importa immagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} percorso, "
+msgstr[1] "{0} percorsi, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} percorso, "
+msgstr[1] "{0} percorsi, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punto del percorso"
+msgstr[1] "{0} punti del percorso"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrizione: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Timespan/Arco di tempo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Lunghezza: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Converti in livello dati"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Il caricamento di dati GPS non elaborati come dati di mappa è "
+"considerato dannoso.<br>Se si desidera caricare delle tracce, vedere qui:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Convertito da: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Scarica da OSM lungo questo tracciato"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Scarica tutto entro:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metri"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Area massima per richiesta:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km quadrati"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Questa azione richiederà {0} richieste di scarico distinte.<br>Si "
+"vuole procedere?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Alcuni punti del percorso con marcature temporali precedenti l'inizio o "
+"successivi alla fine del tracciato sono stati omessi o posizionati "
+"all'inizio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Sono stati esclusi alcuni punti del percorso che sono troppo lontani dal "
+"tracciato per poter essere giustamente calcolati."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Livello dati {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "al di fuori dell'area scaricata"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "versione {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+"Attenzione: l'uso contemporaneo di dati nelle versioni 0.5 e 0.6 risulterà "
+"nella versione 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Ci sono stati {0} conflitti durante l'importazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} è composto da:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} eliminati)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "disattiva"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "Versione delle API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Converti in un layer GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "traccia"
+msgstr[1] "tracce"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punto"
+msgstr[1] "punti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "una traccia con {0} punto"
+msgstr[1] "una traccia con {0} punti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} è composto da {1} traccia"
+msgstr[1] "{0} è composto da {1} tracce"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punto"
+msgstr[1] "{0} punti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "segnaposto gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "marcatore"
+msgstr[1] "marcatori"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} è composto da {1} marcatore"
+msgstr[1] "{0} è composto da {1} marcatori"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Sincronizza l'audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Audio sincronizzato al punto {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+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:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "Premi pausa nel punto del tracciato dove vuoi il marcatore"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Non ci sono marcatori audio in questo layer da compensare."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"E' necessario spostare la testina di riproduzione in prossimità del "
+"tracciato GPX a cui è associata la traccia audio che si vuole riprodurre "
+"(dopo il primo marcatore)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Sposta (premendo SHIFT) l'inizio dell'audio sopra un marcatore audio o sul "
+"tracciato da sincronizzare."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Impossibile creare un nuovo segnaposto Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Impossibile mostrare l'URL per questo marcatore"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Impossibile visualizzare l'URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Preferenze avanzate"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Impostazione diretta delle preferenze. Usare con cautela!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Cerca: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Il valore corrente è quello di default."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Il valore di default è ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Il valore di default è sconosciuto (l'impostazione non è stata ancora usata)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Scegli la riga da modificare."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Nuovo valore per {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Scegli la riga da cancellare."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Inserisci una nuova coppia chiave/valore"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Mostra il menu audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Marcatore di etichetta audio (e immagine e web)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Mostra la traccia audio attiva."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Crea marcatori non-audio quando leggi un file GPX."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Punti del percorso espliciti con data/ora valida."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+"Punti del percorso espliciti con ora stimata a partire dalla posizione del "
+"tracciato."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Punti del tracciato nominati."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Orari di modifica (marcatori temporali) dei file audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+"Partenza del tracciato (dovresti sempre eseguire questo se non ci sono altri "
+"marcatori disponibili)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Mostra o nascondi il menù audio nella barra del menù principale."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Mostra una icona di movimento che rappresenta il punto sul tracciato da "
+"sincronizzare dove la traccia audio attualmente utilizzata è stata "
+"registrata."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Inserisci il testo dell'etichetta (e dell'immagine e del web) rispetto al "
+"marcatore audio come icona del tasto."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Quando si apre un layer GPX crea automaticamente un marcatore sul livello "
+"per ogni punto del percorso."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Quando importi l'audio, crea marcatori da ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+"Quando si importa l'audio, applicalo ad ogni punto del percorso nel livello "
+"GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Crea automaticamente dei marcatori audio dai punti del tracciato (invece che "
+"dai punti del percorso espliciti) con i nomi o le descrizioni."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Crea i marcatori audio nella posizione del tracciato corrispondente "
+"all'orario di modifica di ogni file audio WAV importato."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Il numero di secondi da saltare in avanti o indietro quando il relativo "
+"bottone è schiacciato"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Avanti/indietro del tempo (in secondi)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "Valore dell'aumento della velocità per l'avanzamento veloce"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Incrementazione dell'avanzamento veloce"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Richiesta di secondi di anticipo (o ritardo se il numero è negativo) nella "
+"traccia audio dalla posizione richiesta"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Tempo di rappresentazione (secondi)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+"Rapporto del tempo trascorso del registratore vocale con il vero tempo "
+"trascorso"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Calibrazione del registratore vocale"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Colore"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Stile di disegno {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Livello: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Scegliere"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Scegliere un colore per {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Reimposta predefinito"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Reimposta tutto predefinito"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Colori usati da diversi oggetti in JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Colori"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6383,30 +6418,30 @@
 msgstr "Tutti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "File locali"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Nessuno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forza le linee se nessun segmento è stato importato."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Disegna dei punti GPS grandi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocità (rosso = lento, verde = veloce)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Diluizione della precisione (rosso = alta, verde = bassa, se disponibile)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Singolo colore (può essere personalizzato per i livelli con nome)"
@@ -6414,5 +6449,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6433,5 +6468,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6469,5 +6504,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6480,16 +6515,16 @@
 msgstr "Pedone"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Disegna le linee di direzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Disegno veloce (appare più brutto)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -6497,34 +6532,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Solo sull''estremità di un percorso."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Disegna i numeri d'ordine dei segmenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Disegna i confini dei dati scaricati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Disegna dei nodi virtuali nella modalità selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Disegna con altri colori i layer non attivi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Grafica della mappa migliorata (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Disegna le linee tra i punti GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6536,9 +6571,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Massima lunghezza per files locali (metri)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6547,10 +6582,10 @@
 "permettere qualsiasi lunghezza."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6559,5 +6594,5 @@
 "sulle linee."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -6565,5 +6600,5 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6572,5 +6607,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6578,13 +6613,13 @@
 msgstr "Non disegnare le frecce se non sono distanti dalla precedente almeno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Distanza minima (in pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Disegna dei cerchi più grandi per i punti GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6594,9 +6629,9 @@
 "personalizzato nel Gestore dei Livelli."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Colora i punti e i segmenti del tracciato in base alla velocità."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6607,5 +6642,5 @@
 "di acquisizione registri queste informazioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -6613,18 +6648,18 @@
 "velocità medie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Colorazione del tracciato e del punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "Punti GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Disegna il verso sui segmenti dei percorsi."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
@@ -6632,5 +6667,5 @@
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -6638,10 +6673,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Disegna i confini dei dati scaricati dal server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6650,99 +6685,120 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Disegna con un colore diverso i layer non attivi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "Dati OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Mantieni i file di backup"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Una volta salvato, mantieni i file di backup che finiscono con ~"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Mostra la finestra d'avvio"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Mostra l'ID dell'oggetto nelle liste di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Disegna la linea d''aiuto ad elastico"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Lavoro senza modalità di editing (Stile Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Non richiedere di cambiare modo di lavoro (stile di lavoro Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Aspetto e stile"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Predefinito (determinato automaticamente)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Lingua"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Abilitato 'built-in' predefinito"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Abilitato 'built-in' predefinito"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Tipo di pista"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Configura le estensioni disponibili."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Scarica la lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Configura i siti..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr "Aggiungi indirizzo URL di descrizione dell'estensione JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Seleziona una voce."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr "Modifica indirizzo URL di descrizione dell'estensione JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Configura i siti delle estensioni"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Impostazioni di visualizzazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6752,83 +6808,83 @@
 "programma."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Impostazioni di connessione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Impostazioni di connessione al server OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Impostazioni della mappa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 "Impostazioni per la proiezione della mappa e l'interpretazione dei dati."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Impostazione dell'audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Impostazioni del riproduttore audio e del marcatore audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 "È necessario riavviare JOSM perché alcune impostazioni abbiano effetto."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Visualizza le coordinate come"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Metodo di proiezione"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Proiezione della mappa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Metodo di proiezione"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Visualizza le coordinate come"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Abilita il server proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Impostazioni Proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Host del server proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Porta del server poxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "username del server proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Password del server proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "L'URL di base per il server OSM (API REST)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6837,17 +6893,17 @@
 "password."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "URL di base per il server"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+msgstr "Nome utente OSM (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "Password OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6862,78 +6918,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Preferenze nei collegamenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Cambiare manualmente i collegamenti ai tasti."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Azione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Descrizione: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Livello: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Autori: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Aiuto: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versione {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Copia predefinito"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Selezionare la riga da copiare."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Aggiungi una nuova sorgente alla lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Elimina la sorgente selezionata nella lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Ordina il menu dei Predefiniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Abilitato 'built-in' predefinito"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Sorgente preimpostazioni etichette"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Il sorgente (URL o filename) dei files delle etichette predefinite. Vedi "
-"http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-"Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Elimina la sorgente selezionata nella lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Etichette preimpostate"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Sorgenti preimpostazioni etichette"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Separatore"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Barra degli strumenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Personalizzazione barra degli strumenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Personalizza gli elementi nella barra degli strumenti"
@@ -7211,6 +7297,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7219,7 +7305,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Il file {0} esiste. Sovrascrivere?"
+msgstr "il file \"{0}\" non esiste"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7227,5 +7313,5 @@
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Analisi del file \"{0}\" fallita"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
@@ -7547,5 +7633,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7555,15 +7641,15 @@
 msgstr "{0}% ({1}/{2}), {3} rimanenti. Caricamento di {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Aggiorna estensioni"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Scarica Estensioni"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7576,5 +7662,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7584,23 +7670,23 @@
 "Le estensioni {0} sono state scaricate con successo. Riavviare JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Scaricamento estensione {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
 msgid "Skip download"
 msgstr "Salta il download"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "Per l''estensione {1} è richiesta la versione di JOSM {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Download Plugin"
 msgstr "Scarica estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr "Salta scaricamento"
@@ -7653,6 +7739,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Disabilita estensione"
@@ -7667,5 +7753,5 @@
 msgstr "Mantieni estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7675,5 +7761,5 @@
 "i permessi per sovrascrivere quelle esistenti."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7683,10 +7769,10 @@
 "dall'estensione ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Secondo le informazioni all'interno del plugin l'autore è {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7695,9 +7781,9 @@
 "comunicare un bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Disabilitare l'estensione?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7707,5 +7793,5 @@
 "eliminare l'estensione."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7715,19 +7801,19 @@
 "cui si è ottenuto JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Informazioni"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "nessuna descrizione disponibile"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "Maggiori dettagli"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7736,13 +7822,13 @@
 msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Non è stata trovata alcuna informazione sulle estensioni."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Tutte le estensioni sono state aggiornate."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7755,9 +7841,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Scarica le estensioni mancanti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7770,6 +7856,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7792,14 +7878,14 @@
 msgstr "sconosciuto"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versione {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Estensioni fornite con JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -8063,45 +8149,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Estrazione delle localizzazioni GPS dagli EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Inizio analisi cartella"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Uno dei file selezionati è nullo !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Lettura delle foto ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Non è possibile ottenere il percorso canonico per la cartella {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Analisi cartella {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Trovato un file nullo nella cartella {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Correlazione ai dati GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8312,20 +8398,20 @@
 msgstr "Secondi: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Correlate {0} su {1} foto al tracciato GPX."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Differenza di orario pari a {0} giorni)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Differenza tra il tracciato e le foto: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8333,13 +8419,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "E' fallita la correlazione delle foto al tracciato"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Regola fuso orario e differenza"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Valori predefiniti"
@@ -8361,5 +8447,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Errore durante il caricamento del file"
@@ -8725,5 +8811,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Livello vuoto"
@@ -8769,4 +8855,6 @@
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
+"Zona di Lambert {0} nella cache non compatibile con la zona di Lambert {1} "
+"corrente"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419
@@ -8828,20 +8916,22 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "File TangoGPS (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr "Errori di formato: "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "Importazione TangoGPS corretta"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "Importazione TangoGPS fallita!"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Errore nel formato del file"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA importato con successo"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Importazione NMEA non riuscita!"
+msgid "TCX Files (*.tcx)"
+msgstr "File TangoGPS (*.log)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8866,5 +8956,5 @@
 msgstr "Crea un percorso duplicato"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Livello per la modifica dei tracciati GPX"
@@ -8885,11 +8975,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Importa percorso da un livello GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Elimina percorso esistente"
@@ -8898,6 +8988,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Non è stato trovato alcun livello dei dati GPX."
@@ -8960,6 +9050,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Aggiorna"
@@ -9268,7 +9358,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "acqua"
@@ -9621,14 +9711,14 @@
 "singola stringa"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Apri OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9765,19 +9855,19 @@
 msgstr "Azioni permesse"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Dettagli della richiesta: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Si vuole permettere questo?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9896,5 +9986,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Flush Tile Cache"
-msgstr ""
+msgstr "Svuota la Tile Cache"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
@@ -9903,7 +9993,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Invio in corso..."
+msgstr "caricamento immagine..."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -10098,13 +10187,4 @@
 "Prima è necessario specificare nelle preferenze le sorgenti per le "
 "preimpostazioni delle etichette."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importa file TCX..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importa file TCX come tracciato GPS"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10260,4 +10340,6 @@
 msgid "No intersection found. Nothing was changed."
 msgstr ""
+"Non è stata trovata alcuna intersezione. Non è stata apportata alcuna "
+"modifica."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
@@ -10323,29 +10405,29 @@
 "specifico."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Inserire Lat/Lon a cui andare."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Puoi anche incollare un URL da www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoom (in metri)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "Indirizzo URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Salta lì"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Salta alla posizione"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
@@ -10353,5 +10435,5 @@
 "Verifica."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Impossibile interpretare longitudine/latitudine"
@@ -10676,9 +10758,9 @@
 "errori d'ortografia."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Analizzatore delle proprietà :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
@@ -10686,15 +10768,15 @@
 "proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Linea TagChecker non valida - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Linea di correzione ortografica non valida: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10705,5 +10787,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Combinazione illegale etichetta/valore"
@@ -10711,60 +10793,60 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Problema di disegno"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Chiave ''{0}'' non valida."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Tag con valori vuoti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "chiave della proprietà non valida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "spazio non valido nella chiave della proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Il valore della proprietà inizia o finisce con uno spazio"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Il valore della proprietà contiene una entità HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Chiave ''{0}'' non presente nei preimpostati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "I preimpostati non contengono la chiave della proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Valore ''{0}'' per la chiave ''{1}'' non presente nei preimpostati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "I preimpostati non contengono il valore della proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXME"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Verifica le chiavi delle proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -10772,20 +10854,20 @@
 "valide."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Usa un analizzatore delle proprietà complesso."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valida i valori delle proprietà e delle etichette usando regole complesse."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Sorgente TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10796,21 +10878,21 @@
 "delle etichette."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Aggiungi una nuova sorgente alla lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Modifica la sorgente selezionata."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Sorgenti dei dati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Verifica i valori delle proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -10818,9 +10900,9 @@
 "validi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Cerca FIXME."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -10828,46 +10910,56 @@
 "proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Controllare le note di disegno."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Controllare se il disegno della mappa contiene degli errori."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Usa file dati predefinito."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Usa il file dati predefinito (consigliato)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Usa file dati predefinito."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Usa il file dati predefinito (consigliato)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Usa file di controllo ortografico predefinito."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Usa il file di controllo ortografico predefinito (consigliato)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Correggi proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Impossibile trovare il tipo di elemento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Impossibile trovare il livello di avvertimento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Espressione illegale \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -11012,7 +11104,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "building"
@@ -11026,5 +11118,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "area"
@@ -11034,25 +11126,25 @@
 msgstr "Percorso non chiuso"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Percorsi non connessi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Questo test controlla se una via finisce molto vicina ad un'altra via."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Nodo finale del percorso vicino ad altra strada"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Nodo finale del percorso vicino ad altro percorso"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Nodo del percorso vicino ad altro percorso"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Nodo finale della strada collegata vicino ad un'altra strada"
@@ -11079,17 +11171,22 @@
 "nodo."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Percorsi senza nome"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Modifica un incrocio"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Percorsi senza etichetta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Percorsi vuoti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Percorsi composti da un singolo nodo"
@@ -11129,14 +11226,14 @@
 msgstr "Selezionare un nodo iniziale alla fine di un percorso"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr "E' stata raggiunta la fine della linea"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr "E' stato raggiunto un incrocio"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "E' stata generata una eccezione"
@@ -11236,5 +11333,5 @@
 msgstr "Correggere la posizione del layer WMS selezionato"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11249,5 +11346,5 @@
 msgstr "Scaricamento automatico"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
@@ -11255,10 +11352,10 @@
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, 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:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11267,102 +11364,91 @@
 "oppure cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Scarica i tasselli visibili"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Ricarica tile sbagliati"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Salva livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Carica livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Errore nel formato del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Apri un livello WMS vuoto per caricare i dati da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Preferenze dell'estensione WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modifica la lista dei server WMS mostrata nel menù dell'estensione WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Nome del Menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Nome del menu (predefinito)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "URL WMS (Predefinito)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Inserire un nome per il menù e un URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Copia predefinito"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Selezionare la riga da copiare."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr "Sovrapponi tiles"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% di lat:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% di lon:"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Scarica"
 
 #. *
@@ -11457,5 +11543,5 @@
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Permette l'importazione di file di vario formato direttamente in JOSM."
 
 #. Plugin DirectUpload
@@ -11624,16 +11710,11 @@
 "indipendente."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Carica i file TCX direttamente da JOSM."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce degli edifici a schiera a partire da singoli blocchi."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11645,5 +11726,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11654,5 +11735,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11664,11 +11745,11 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+"Scaricamento facilitato lungo un numeroso insieme di percorsi interconnessi"
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-"Scaricamento facilitato lungo un numeroso insieme di percorsi interconnessi"
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12467,4 +12548,64 @@
 msgstr "Permesso di accesso"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "si"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12488,5 +12629,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "privato"
@@ -12534,5 +12675,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "destinazione"
@@ -12569,5 +12710,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "permesso"
@@ -12586,4 +12727,28 @@
 msgid "agricultural"
 msgstr "Agricolo"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "no"
 
 #: build/trans_presets.java:315
@@ -12799,6 +12964,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "motorway"
@@ -12824,6 +12989,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "trunk"
@@ -12849,6 +13014,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "primary"
@@ -12874,6 +13039,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "secondary"
@@ -12887,5 +13052,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "tertiary"
@@ -12903,5 +13068,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "residential"
@@ -12919,5 +13084,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "service"
@@ -12944,6 +13126,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "construction"
@@ -12993,5 +13175,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "rotatoria"
@@ -13970,5 +14152,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "palude alluvionale"
@@ -15699,27 +15881,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -18558,8 +18740,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "bicicletta"
@@ -18628,8 +18810,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "pedone"
@@ -18655,5 +18837,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metropolitana"
@@ -18783,4 +18965,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18789,4 +18972,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18795,4 +18979,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18801,4 +18986,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18862,7 +19048,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "ponte"
@@ -18920,4 +19106,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19043,7 +19230,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -19126,15 +19313,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "deprecato"
@@ -19176,5 +19363,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "cavallo"
@@ -19384,11 +19571,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "barriera"
@@ -19426,6 +19613,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "strada"
@@ -19481,7 +19668,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "tracciato_stradale"
@@ -19537,8 +19724,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "ferrovia"
@@ -19559,5 +19746,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "servizi"
@@ -19571,5 +19758,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr "guado"
@@ -19590,5 +19777,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "slargo per inversione di marcia"
@@ -19603,5 +19790,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr "punto di accesso di emergenza"
@@ -19616,5 +19803,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "sponda"
@@ -19628,5 +19815,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "torrente"
@@ -19640,5 +19827,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "darsena"
@@ -19666,5 +19853,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "acquedotto"
@@ -19832,13 +20019,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "costruzioni umane"
@@ -19900,7 +20087,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -19923,10 +20110,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "altro_ferrovia"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "ferrovia (sopra)"
@@ -19946,7 +20133,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19954,8 +20144,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "vecchia_ferrovia"
@@ -20000,6 +20194,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "aeroporto"
@@ -20013,5 +20207,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminal"
@@ -20033,5 +20227,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "aeroporto (scuro)"
@@ -20045,5 +20239,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "aeroporto (chiaro)"
@@ -20091,7 +20285,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "struttura_di_risalita"
@@ -20108,5 +20302,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "pista_facile"
@@ -20121,5 +20315,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "pista_intermedia"
@@ -20134,5 +20328,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "pista_avanzata"
@@ -20147,5 +20341,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "pista esperto"
@@ -20160,5 +20354,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "pista_libera"
@@ -20173,5 +20367,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "pista_principiante"
@@ -20276,10 +20470,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "elettricità"
@@ -20293,5 +20487,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "pontile"
@@ -20305,5 +20499,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "conduttura"
@@ -20431,12 +20625,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "struttura per lo svago"
@@ -20450,5 +20644,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "porto turistico"
@@ -20520,8 +20714,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "struttura di servizio"
@@ -20623,10 +20817,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "servizio al traffico"
@@ -21012,22 +21206,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "struttura di servizio (chiaro)"
@@ -21059,6 +21253,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "acqua (chiaro)"
@@ -21119,8 +21313,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "salute"
@@ -21473,26 +21667,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "negozio"
@@ -21564,8 +21758,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotel"
@@ -21715,9 +21909,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turismo"
@@ -21789,8 +21983,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "attrazione storica"
@@ -21861,8 +22055,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "verde"
@@ -21876,5 +22070,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "cava/miniera"
@@ -21888,5 +22082,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "discarica"
@@ -21908,5 +22102,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "bacino"
@@ -21920,5 +22114,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "foresta"
@@ -21932,5 +22126,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "aia"
@@ -21953,5 +22147,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "area commerciale (negozi)"
@@ -21965,5 +22159,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "industriale"
@@ -21977,5 +22171,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "ridestinazione d'uso"
@@ -21989,5 +22183,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -22001,5 +22195,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "area ferroviaria"
@@ -22056,7 +22250,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "militare"
@@ -22070,5 +22264,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "cimitero"
@@ -22081,5 +22275,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "picco montuoso"
@@ -22094,5 +22288,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "ghiacciaio"
@@ -22106,5 +22300,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "vulcano"
@@ -22159,8 +22353,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "elemento naturale"
@@ -22174,5 +22368,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "boscaglia"
@@ -22186,5 +22380,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "brughiera"
@@ -22198,5 +22392,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "bosco"
@@ -22210,5 +22404,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -22222,5 +22416,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "spiaggia"
@@ -22298,8 +22492,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "percorso"
@@ -22347,7 +22541,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "confine"
@@ -22489,10 +22683,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "luogo"
@@ -22540,6 +22734,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "indirizzo"
@@ -22770,10 +22964,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22781,5 +22975,5 @@
 msgstr "Mappe NPE"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22787,71 +22981,146 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Dati OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (correzione GNOME)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Cycleway"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Geofabrik.de dell'Alto Palatinato"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Geofabrik.de delle strade del Nord Reno-Westfalia"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr "Terraserver Topo"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr "Terraserver Urban"
 
+#~ msgid "Data Layer"
+#~ msgstr "Livello dati"
+
+#~ msgid "Change"
+#~ msgstr "Cambia"
+
+#~ msgid "Rotate"
+#~ msgstr "Ruota"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Selezionare almeno un nodo, percorso o relazione. Solo gli elementi già "
-#~ "caricati hanno uno storico."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Ripristino via"
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Ripristino relazione..."
-
-#~ msgid "Selection too big"
-#~ msgstr "Selezione troppo grande"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "L''immagine con il percorso {0} non esiste o non è leggibile."
+#~ "La proiezione \"{0}\" è progettata solo per \n"
+#~ "latitudini comprese tra 46.1° e 57°.\n"
+#~ "Usa un altro sistema di proiezione se non stai usando\n"
+#~ "un server WMS francese.\n"
+#~ "Non caricarire nessun dato dopo questo messaggio."
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "La proiezione \"{0}\" è progettata solamente per\n"
+#~ "latitudini comprese fra 45.7° e 47.9\n"
+#~ "e longitudini comprese fra 5.7° e 10.6°.\n"
+#~ "Usa un altro sistema di proiezione se non stai lavorando\n"
+#~ "su un set di dati relativo alla Svizzera od al Liechtenstein.\n"
+#~ "Non caricare altri dati dopo questo messaggio."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Conflitti: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Sorgente preimpostazioni etichette"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "Il sorgente (URL o filename) dei files delle etichette predefinite. Vedi "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr ""
+#~ "Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Sorgenti preimpostazioni etichette"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importa file TCX..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importa file TCX come tracciato GPS"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Sovrapponi tiles"
+
+#~ msgid "% of lat:"
+#~ msgstr "% di lat:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% di lon:"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Carica i file TCX direttamente da JOSM."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (correzione GNOME)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Geofabrik.de dell'Alto Palatinato"
 
 #~ msgid "Uploading data"
 #~ msgstr "Caricamento dei dati"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Non ancora implementato."
+
 #~ msgid "Email"
 #~ msgstr "Email"
@@ -22859,4 +23128,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Resolvi conflitti"
+
+#~ msgid "Object"
+#~ msgstr "Oggetto"
 
 #~ msgid "{0} object has conflicts:"
@@ -22897,4 +23169,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Risolvere {0} conflitti in {1} oggetti"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Fare clic su Ricarica per aggiornare la lista"
+
+#~ msgid "Revert"
+#~ msgstr "Ripristina"
+
+#~ 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 "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -23076,4 +23364,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Selezionare almeno un nodo, percorso o relazione. Solo gli elementi già "
+#~ "caricati hanno uno storico."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -23136,4 +23431,7 @@
 #~ msgstr "Il caricamento dei dati è fallito per una ragione sconosciuta"
 
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "L''immagine con il percorso {0} non esiste o non è leggibile."
+
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
@@ -23151,2 +23449,11 @@
 #~ "negli elementi personali non appena saranno applicate le decisioni "
 #~ "sull'unione."
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "Ripristino via"
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "Ripristino relazione..."
+
+#~ msgid "Selection too big"
+#~ msgstr "Selezione troppo grande"
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 16400)
+++ applications/editors/josm/i18n/po/ja.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-23 06:12+0000\n"
-"Last-Translator: MAPconcierge <taichi@mapconcierge.jp>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-02 03:36+0000\n"
+"Last-Translator: Mage Whopper <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:19+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,31 +32,32 @@
 msgstr "ヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "投影法が設定から読み取れません。メルカトル図法を使います。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "保存されていない変更"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "保存されていない変更があります。変更分を破棄して継続しますか？"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "保存して終了"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "変更を破棄して終了"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -69,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -88,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -99,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "不正な形式のURLの\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "不正な形式のファイルURL\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "不明"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "情報"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "情報を表示する。"
@@ -132,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -143,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "バージョン{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "{0}の最後の変更"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java バージョン {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "バグ報告"
@@ -171,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -177,27 +179,27 @@
 msgstr "情報"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "はじめにお読みください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "リビジョン"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "貢献"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "JOSMについて"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "ファイルは存在しませんでした。"
@@ -211,12 +213,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "少なくとも1つはノードかウェイを選んでください。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "警告"
@@ -271,5 +272,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "緯度"
@@ -278,5 +279,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "経度"
@@ -284,5 +285,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "ノードを円形に配列"
@@ -295,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -363,7 +364,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "初期化されていません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -382,7 +382,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "競合中のリレーション"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -391,37 +390,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "データ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "レイヤ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "ダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0}へズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "{0}のビューへズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -431,9 +430,9 @@
 msgstr "表示: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "ズームする選択がありませｎ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "ズームの対象になる競合はありません"
@@ -524,39 +523,43 @@
 msgstr "コピーするものを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "円形を作成します"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "3つのノードから円形を作成します"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr "円形内にそのノードはありません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 "３つだけノードを選択するか、３つだけのノードを持つ１つのウェイを選択してくだ"
 "さい。"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "円形内にそのノードはありません。"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "削除"
@@ -606,5 +609,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -713,11 +716,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -728,5 +732,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "エラー"
@@ -736,30 +740,30 @@
 msgstr "事前定義のライセンスを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSMオンラインヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "ブラウザで開く"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "編集"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -767,19 +771,19 @@
 msgstr "再読込"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "JOSMオンラインヘルプからのページのみ編集できます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "ページ{0}を読み込む際にエラーが発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -794,18 +798,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "OSMノードやウエイに関する履歴情報の表示"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "要素の履歴"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "OSMノードやウエイに関する履歴情報の表示"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -865,5 +866,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "鏡像"
@@ -902,10 +903,10 @@
 msgstr "右"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "移動 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -913,5 +914,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "オブジェクトを世界の外に移動できません。"
@@ -1106,5 +1107,5 @@
 msgstr "ファイル {0}は存在します。上書きしますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1114,26 +1115,25 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "一つも開かれたデータがありませんんで、保存されません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "空の文書"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "文書にデータが含まれない"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "それでも保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1143,36 +1143,36 @@
 "れます。続けますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "競合を否定して保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "OSMファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "GPXファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "レイヤーを保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "ファイルをバックアップできませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "ファイルの拡張子が不明です"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "保存中にエラー発生"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "バックアップファイルから復元するときに、エラーになりました。"
@@ -1224,6 +1224,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "閉じる"
@@ -1292,12 +1293,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"リレーションのメンバーが持つロールは、新しい全てのウェイにコピーされまし"
-"た。\n"
-"確認して、必要なら訂正してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1481,68 +1478,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "OSMにアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "OSMサーバにすべての変更をアップロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "追加するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "修正するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "削除するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "アップロードする変更の概略コメントを入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "この変更をアップロードしますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "変更のアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "未解決の競合があります。まずこれらの競合を解決してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "アップロードする変更はありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1556,17 +1553,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1577,10 +1574,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1590,9 +1587,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1602,18 +1599,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1718,24 +1715,15 @@
 msgstr "生のGPSデータ"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "データをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "データーはインポートされませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "データーレイヤー {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMapデータ"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "データレイヤー"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1777,5 +1765,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1877,5 +1865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
@@ -1886,5 +1874,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "回転を止めるには、マウスボタンを放します。"
@@ -1902,7 +1890,7 @@
 "を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1910,9 +1898,9 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "オブジェクトの選択、移動および回転"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1920,5 +1908,28 @@
 msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "左へ移動"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "左へ移動"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "取り消し"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1927,5 +1938,5 @@
 "マージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1944,5 +1955,5 @@
 msgstr "ズームと地図の移動"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2215,35 +2226,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "追加"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "更新"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "削除 {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "{0}このオブジェクトを変更"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Remove \"{0}\" for {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Set {0}={1} for {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2252,19 +2255,26 @@
 msgstr[0] "オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Remove \"{0}\" for {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Set {0}={1} for {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
 msgstr "ChangeRelationMemberRole"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2272,25 +2282,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "削除 {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "削除 {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "競合中のリレーション"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2301,11 +2311,11 @@
 "関連から削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2316,10 +2326,10 @@
 "関連から削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "ウェイのセグメントを分割"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2331,20 +2341,20 @@
 "起こします。<br>本当に削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "移動"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2369,43 +2379,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "セレクションの削除"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "RemoveRelationMember"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "回転"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, 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:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2504,25 +2520,51 @@
 msgstr "サーバから設定をロードできませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "十進経緯度"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr "度分秒"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "南"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "北"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "西"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "東"
@@ -2533,5 +2575,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2556,5 +2598,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2649,17 +2691,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2667,16 +2705,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2688,127 +2715,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "領域を指定するウエイが閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "メンバー \"{0}\"を関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "ウエイ\"{0}\"は二つ未満のポイントです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr "二つ以上の\"from\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "経由地が複数有ります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明なロール\"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "{0}のメンバーのタイプが不明"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "\"from\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "\"to\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "経由地かウエイが見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "制約条件{0}のスタイルがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "ウエイ \"{0}\"と\"{1}\"の交差する点"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "内部のウェイ ''{0}''が外側にあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "タグ付いていない"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "テキスト"
@@ -2816,5 +2843,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2842,6 +2869,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "背景"
@@ -2851,24 +2878,9 @@
 msgstr "ハイライト"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"投影法\"{0}\"は、緯度が46.1°から57°の\n"
-"間で使われるように設計されています。\n"
-"フランスのWMSサーバをつかうのではなければ、\n"
-"ほかの投影法を使用してください。\n"
-"本メッセージ後は、データのアップロードはやめてください。"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2884,36 +2896,24 @@
 "新しいレイヤーを新しいゾーンで開始してください。"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "ランベルトゾーン（フランス）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "ランベルトゾーン（エストニア）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "メルカトル"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"投影法 \"{0}\" は、\n"
-"緯度 45.7°から 47.9°で\n"
-"経度  5.7°から 10.6°まで用です。\n"
-"スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n"
-"違う投影系を使ってください。\n"
-"このメッセージ以降のデータはアップロードしないでください。"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "スイスグリッド (スイス)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "移動 {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2925,14 +2925,14 @@
 msgstr "ブックマークを書き込みできません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "今日のメッセージはありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- 起動中のバージョンは {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "\"今日のメッセージ\"をダウンロード"
@@ -3125,5 +3125,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3185,5 +3184,5 @@
 msgstr "ズームアウト"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "拡大・縮小"
@@ -3217,8 +3216,13 @@
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "レイヤーがリストにありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3226,9 +3230,9 @@
 msgstr "OSMサーバに接続…"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "解析中にエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "ファイルが見つかりません"
@@ -3288,4 +3292,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3295,4 +3300,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3300,5 +3307,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "メンバー"
@@ -3494,7 +3502,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3574,4 +3582,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3579,4 +3590,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3586,4 +3598,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3612,7 +3625,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "接続に失敗しました。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3700,7 +3712,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "場所の名称を入力してください。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3742,7 +3753,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "日付なし"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3774,7 +3784,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "セレクションの削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3785,9 +3794,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "役割"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3805,4 +3816,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3826,8 +3839,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3838,7 +3851,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3894,5 +3908,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "指示の集積"
@@ -3903,6 +3917,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3913,5 +3927,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3920,10 +3934,27 @@
 msgstr "トグル: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "指示の集積: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "競合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "競合点の統合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "解決"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "上記リストの全てのアイテムを結合するダイアログを開く"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3932,26 +3963,4 @@
 msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "解決"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "上記リストの全てのアイテムを結合するダイアログを開く"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "競合"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "競合点の統合"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "競合: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -3987,45 +3996,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "リストを更新するために再読込のクリック"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "履歴"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "選択したアイテムすべての履歴の表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "オブジェクト"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "日付"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "現在選択しているオブジェクトを再読み込みし、リストを再作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "取り消す"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョンへ"
-"と戻します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "まだ実装されていません。"
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4156,4 +4168,18 @@
 msgid "Add Properties"
 msgstr "プロパティの追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "追加"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4264,9 +4290,9 @@
 msgstr "選択: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "パネルの取り外し"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4275,5 +4301,5 @@
 "ます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "クリックすることでパネルの内容を最小化/最大化"
@@ -4303,179 +4329,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "変更の適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "基本"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "次によって占められる;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "継げられた"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "タグ（空の値でタグ自身を削除）"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "上に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "現在選択したメンバーを一つ上に移動します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "選択したものを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "現在選択されている全てのオブジェクトをメンバーとして追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "選択の削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "現在選択されている全てのオブジェクトを関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "スポーツ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "リストから選択した情報源を削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "下に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "この関連から現在の行のメンバーを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "この関連の全ての未完成のウェイとノードをダウンロード"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "はい"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "いいえ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "メンバー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "関連の編集者:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "インポート中に競合を発見しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "サーバからの応答内容が不正です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "サーバに接続できません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4510,21 +4459,21 @@
 msgstr "最初にブックマークを選択してください、"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "最小経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "最大経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4534,5 +4483,5 @@
 "ることができます。）"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "境界囲み"
@@ -4681,670 +4630,41 @@
 msgstr "タイル数"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "{0} のイメージ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "GPXの読み込み…"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "地点 {0} x {1}に時刻がありません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "{0}を読み込んでいます ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "ジオタグのついた画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS開始: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS終了: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "現在の差分: {0} 秒"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "タイムゾーンの違い: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "トラック内に {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "時計の同期"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEGイメージ(*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "ファイル \"{0}\"中の日付が取得できません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "時刻をGPSユニットと同期する"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "入力した時刻は、解釈できません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "GPSポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "線描画のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "全体設定を使用"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引く。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引かない。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "線描画オプションの選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "配色のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "既定"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "色選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "名前のついた地点からのマーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} からの名前付きトラックポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "音声のインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "WAV音声ファイル(*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} からの音声マーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "イメージのインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} トラック "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0}ルート, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} ウェイポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "名前: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "記述: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Timespan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "長さ: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "データレイヤーへ変換"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>マップデータとして加工されていないGPSデータをアップロードすることは、有"
-"害だと考えられています。<br>もしトレースをアップロードしたいならば、ここを見"
-"てください："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "{0}からのコンバート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "このトラックに沿ってOSMからダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "次の範囲内の全てをダウンロード:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} メータ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "リクエストあたりの最大面積："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} 平方キロメートル"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けま"
-"すか？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
-"に変更又は移動されました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"ウエイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
-"外します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "ダウンロード領域の外"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "バージョン {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0}は次からなります:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0}は削除されました)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "設定解除"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "APIバージョン: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "GPXレイヤーの変換"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "トラック"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "ポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "{0}ポイントをもつトラック"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{1}トラックを含む {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} ポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "GPSマーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "マーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0}は、{1}マーカーからなる"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "音声の同期"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "地点 {0}で音声同期をとります"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr "再生されているレイヤーと同期させることができません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr "再生の最初に音声マーカーを作成します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "このレイヤには、開始オフセットを指すオーディオマーカーがありません。"
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッ"
-"グする必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイ"
-"ントの上に持ってくる必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "新しいオーディオマーカーを生成できません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "このマーカーのURLを表示するときにエラーが発生しました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URLは： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "URL を表示する際にエラー"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "高度な設定"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "設定項目を直接変更。利用に注意！"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "検索: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "現在の値は既定値です。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "既定値は \"{0}\"です。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "不明なときの既定値(設定はまだ使われません）"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "編集する列を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "新しい値は{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "削除する列を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "新しいキー/値の組を入力"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "オーディオメニューの表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "音声 (画像やウェブ) マーカーにラベルをつける"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "ライブ音声トレースの表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "GPXを読み込むときにマーカー(オーディオではない)を作成"
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "有効なタイムスタンプによる明示的なウエイポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "トラック位置から時間推定による明示的なウエイポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "名前付きトラックポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "音声ファイルの修正時刻(タイムスタンプ)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "追跡開始（有効なマーカーがないときには常に行う）"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "メインメニューバーでのオーディオメニューの表示・非表示の切り替え"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"現在再生されているオーディオが記録された場所と同期して、その点を示すアイコン"
-"を動かして表示する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラ"
-"ベルを付与する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウエイポイントから作成す"
-"る。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "オーディオをインポート時、次からマーカーを作成..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-"オーディオのインポート時に、GPXレイヤーのウェイポイントに対して、適用する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"（explicitウエイポイントではなく）自動的にトラックポイントからオーディオマー"
-"カーを作成し、名前と説明を付加する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したト"
-"ラックの位置にオーディオマーカーを作成してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr "対応するボタンを押したときに何秒分進む・戻るのか。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "時刻を進める/戻す(秒)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "早回しの時に何倍速にするのか。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "高速再生の倍率"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置か"
-"ら開始する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Lead-in 時間(秒)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr "音声録音の残り時間と実際の残り時間の割合"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "ボイスレコーダの調整"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "色"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6054,5 +5374,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6203,40 +5524,730 @@
 msgstr "名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "{0} のイメージ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "GPXの読み込み…"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "地点 {0} x {1}に時刻がありません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "{0}を読み込んでいます ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "ジオタグのついた画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS開始: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS終了: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "現在の差分: {0} 秒"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "タイムゾーンの違い: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "トラック内に {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "時計の同期"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEGイメージ(*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "ファイル \"{0}\"中の日付が取得できません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "時刻をGPSユニットと同期する"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "入力した時刻は、解釈できません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "GPSポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "線描画のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "全体設定を使用"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引く。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引かない。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "線描画オプションの選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "配色のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "既定"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "色選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "名前のついた地点からのマーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} からの名前付きトラックポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "音声のインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "WAV音声ファイル(*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} からの音声マーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "イメージのインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} トラック "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0}ルート, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} ウェイポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "名前: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "記述: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Timespan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "長さ: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "データレイヤーへ変換"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>マップデータとして加工されていないGPSデータをアップロードすることは、有"
+"害だと考えられています。<br>もしトレースをアップロードしたいならば、ここを見"
+"てください："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "{0}からのコンバート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "このトラックに沿ってOSMからダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "次の範囲内の全てをダウンロード:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} メータ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "リクエストあたりの最大面積："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} 平方キロメートル"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けま"
+"すか？</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
+"に変更又は移動されました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"ウエイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
+"外します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "データーレイヤー {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "ダウンロード領域の外"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "バージョン {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "インポートした内容には {0} の競合があります。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0}は次からなります:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0}は削除されました)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "設定解除"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "APIバージョン: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "GPXレイヤーの変換"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "トラック"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "ポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "{0}ポイントをもつトラック"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{1}トラックを含む {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} ポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "GPSマーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "マーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0}は、{1}マーカーからなる"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "音声の同期"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "地点 {0}で音声同期をとります"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr "再生されているレイヤーと同期させることができません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr "再生の最初に音声マーカーを作成します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "このレイヤには、開始オフセットを指すオーディオマーカーがありません。"
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッ"
+"グする必要があります。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイ"
+"ントの上に持ってくる必要があります。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "新しいオーディオマーカーを生成できません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "このマーカーのURLを表示するときにエラーが発生しました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URLは： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "URL を表示する際にエラー"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "高度な設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "設定項目を直接変更。利用に注意！"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "検索: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "現在の値は既定値です。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "既定値は \"{0}\"です。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "不明なときの既定値(設定はまだ使われません）"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "編集する列を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "新しい値は{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "削除する列を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "新しいキー/値の組を入力"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "オーディオメニューの表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "音声 (画像やウェブ) マーカーにラベルをつける"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "ライブ音声トレースの表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "GPXを読み込むときにマーカー(オーディオではない)を作成"
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "有効なタイムスタンプによる明示的なウエイポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "トラック位置から時間推定による明示的なウエイポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "名前付きトラックポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "音声ファイルの修正時刻(タイムスタンプ)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "追跡開始（有効なマーカーがないときには常に行う）"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "メインメニューバーでのオーディオメニューの表示・非表示の切り替え"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"現在再生されているオーディオが記録された場所と同期して、その点を示すアイコン"
+"を動かして表示する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラ"
+"ベルを付与する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウエイポイントから作成す"
+"る。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "オーディオをインポート時、次からマーカーを作成..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "オーディオをインポートする際に、GPXレイヤーのウェイポイントとして扱う"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"（explicitウエイポイントではなく）自動的にトラックポイントからオーディオマー"
+"カーを作成し、名前と説明を付加する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したト"
+"ラックの位置にオーディオマーカーを作成してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr "対応するボタンを押したときに何秒分進む・戻るのか。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "時刻を進める/戻す(秒)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "早回しの時に何倍速にするのか。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "高速再生の倍率"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置か"
+"ら開始する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Lead-in 時間(秒)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr "音声録音の残り時間と実際の残り時間の割合"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "ボイスレコーダの調整"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "色"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "塗りつぶしスタイル{0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "レイヤ{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "{0}の色を選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "既定値に設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "全てを既定値に設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "JOSMの異なるオブジェクトが使う配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6245,29 +6256,29 @@
 msgstr "全て"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "ローカル・ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "セグメントがインポートされなかったら、強制的に線を描画する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "大きなGPS点を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度（赤＝遅い、緑＝速い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率(赤=高い、緑=低い, 可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -6275,5 +6286,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6294,5 +6305,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6330,5 +6341,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6341,50 +6352,50 @@
 msgstr "徒歩"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "進行方向を矢印表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "必要なときだけ方向ヒントを表示(例：一方通行の時）"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "セグメントの順序番号を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "選択モードで仮想ノードを描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "不活性のレイヤーを他色で描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "地図画像をスムース処理（アンチアライアス）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "GPS生データのポイント間にラインを引いて下さい"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6392,34 +6403,34 @@
 msgstr "ローカルファイルに線を描くの最大長(m)。'-1'にすると全てに線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "ローカルファイルに対する最大長 (メートル)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
 msgstr "線を描く最大長(m)。'-1'にすると全ての線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決めて描画する。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6427,13 +6438,13 @@
 msgstr "少なくともこの距離を超える移動がなかった場合には、矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6443,9 +6454,9 @@
 "可能です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6455,54 +6466,54 @@
 "う。使用しているGPS機器がこの情報を記録している必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "ウェイの変更が容易になるように、選択モードで仮想ノードを描く。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "異なった色で、不活性になっているデータレイヤーを描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSMデータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "バックアップファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
@@ -6510,82 +6521,103 @@
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "起動時にスプラッシュ・スクリーンを表示する"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "選択リストにオブジェクトIDを表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "マウスアイコンへの補助線を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "モードなし作業（Potlatchスタイル)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "モード切替が不要（potlatchスタイルの作業方法)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "ルック＆フィール"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "既定（自動判定）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "言語"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "ビルトインのデフォルトを有効"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "ビルトインのデフォルトを有効"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "ゲレンデのタイプ"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "利用可能なプラグインを設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "リストをダウンロードする"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "アップデート"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "サイトの設定..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+msgstr "JOSM プラグイン情報のURLの追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "エントリーを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+msgstr "JOSM プラグイン情報のURLを編集"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "プラグインサイトを設定"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "表示設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6593,98 +6625,98 @@
 msgstr "プログラム全体の見た目に影響する各種設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "接続設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "OSMサーバへの接続設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "マップ設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "地図投影法とデータ解釈の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "オーディオ設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "オーディオプレイヤーと音声マークの設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "設定を有効にするにはJOSMを再起動する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "座標を次の単位で表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "投影法"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "地図投影法"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "投影法"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "座標を次の単位で表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "プロキシーサーバを有効"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "プロキシー設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "プロキシーサーバのホスト名"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "プロキシーサーバのポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "プロキシーのユーザ名"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "プロキシーのパスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSMサーバのベースURL（REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "サーバのベースURL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSMパスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6699,77 +6731,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "ショートカット設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "キーボードショートカットを手動で変更"
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "アクション"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "ショートカット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "記述: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "レイヤ{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "作者: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "ヘルプ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "バージョン{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "既定のコピー"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "コピーする列を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "新しいソースをリストに追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "リストから選択した情報源を削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "プリセットメニューの並び替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "ビルトインのデフォルトを有効"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "事前に設定した情報源をタグ付け"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳しく"
-"は、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "新しいタグプリセット源をリストに追加する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "リストから選択した情報源を削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "事前設定のタグ付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "事前設定の情報源をタグ付け"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "区切り"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "ツールバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Available"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "ツールバーのカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "ツールバーの要素をカスタマイズ"
@@ -6844,4 +6907,6 @@
 "</p>"
 msgstr ""
+"<p>擬似変更 'disabled' は、次に起こったときにショートカットを無効にします。</"
+"p>"
 
 #. scroll up
@@ -7024,6 +7089,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7032,7 +7097,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "ファイル {0}は存在します。上書きしますか?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7090,9 +7155,9 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
 msgid "NMEA import success"
-msgstr "NMEAインポートの成功"
+msgstr "NMEAのインポートに成功しました。"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51
 msgid "NMEA import faliure!"
-msgstr "NMEAインポートの失敗！"
+msgstr "NMEAのインポートに失敗しました。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
@@ -7348,5 +7413,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7356,15 +7421,15 @@
 msgstr "{0}% ({1}/{2}), {3} 残っています. アップロード中 {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "プラグインのアップデート"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "ダウンロードプラグイン"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7377,30 +7442,30 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
 msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
 msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+"{0} 個のプラグインのダウロードに成功しました。JOSMを再起動してください。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
+msgstr "プラグイン {0} をダウンロードしています..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
-msgstr ""
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr "プラグイン {1} には JOSMのバージョン {0} が必要です。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+msgstr "プラグインをダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7409,5 +7474,5 @@
 #, java-format
 msgid "An error occurred in plugin {0}"
-msgstr "プラグイン {0}でエラーが発生しました。"
+msgstr "プラグイン {0} でエラーが発生しました。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65
@@ -7424,4 +7489,6 @@
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
+"プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要がありま"
+"す。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94
@@ -7439,5 +7506,5 @@
 #, java-format
 msgid "Last plugin update more than {0} days ago."
-msgstr "プラグインの更新が最後に行われてから{0}日以上経過しました。"
+msgstr "プラグインが最後に更新されてから{0}日以上経過しました。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119
@@ -7446,11 +7513,11 @@
 "setting the config option 'pluginmanager.warntime'.)"
 msgstr ""
-"(設定オプションの'pluginmanager.warntime'を編集することで、<br>この警告が何日"
-"たつと出るか、変更できます。)"
+"（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager."
+"warntime'を編集することで変更できます）"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "このプラグインを使用不可にする"
@@ -7465,5 +7532,5 @@
 msgstr "プラグインを継続"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7473,16 +7540,16 @@
 "上書きできる権限があるかどうか、確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr "\"{0}\"プラグインで、予期せぬ例外が発生しました。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "このプラグインから得られる情報では、作者は {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7491,9 +7558,9 @@
 "い。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "このプラグインを使用不可にしますか?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7503,5 +7570,5 @@
 "再起動してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7510,19 +7577,19 @@
 "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "情報"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "説明がありません"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "もっと詳細"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7530,13 +7597,13 @@
 msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "プラグイン情報が見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "インストールされた全てのプラグインは最新です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7549,9 +7616,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "不足するプラグインをダウンロードします。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7564,6 +7631,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7586,14 +7653,14 @@
 msgstr "不明な"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "JOSMに付属のプラグイン"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7704,4 +7771,6 @@
 "in common"
 msgstr ""
+"既存の複数ノードもつ2つのウェイとその交点に基づき、ノードを碁盤の目として、格"
+"子状のウエイ構造をつくります。"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
@@ -7806,5 +7875,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr "AgPifoj - ジオタグされた写真"
+msgstr "ジオタグのある写真"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -7852,45 +7921,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIFからGPS位置を取得"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "ディレクトリ走査の開始"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "選択したファイルはのひとつは null でした !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "写真を取り込む"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "標準的なディレクトリへのパスを入手できません {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "ディレクトリ {0} を走査"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "GPXに関連づける"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8102,20 +8171,20 @@
 msgstr "秒: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(時差 {0} 日)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8123,13 +8192,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "トラックへのフォトマッチに失敗しました。"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "タイムゾーンとオフセットを調整してください。"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "デフォルトの値"
@@ -8151,5 +8220,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
@@ -8362,4 +8431,6 @@
 "building import size is limited to 1 km2 max."
 msgstr ""
+"WMSのオーバーロードを防ぐため、\n"
+"インポートする範囲を1 km2 以下で作成してください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
@@ -8489,5 +8560,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "ブランクのレイヤー"
@@ -8590,17 +8661,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "TangoGPS のインポートに成功しました。"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "TangoGPS のインポートに失敗しました。"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "ファイルフォーマットエラー"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEAインポートの成功"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "NMEAインポートの失敗！"
+msgid "TCX Files (*.tcx)"
+msgstr "GPXファイル(*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8625,5 +8698,5 @@
 msgstr "複製したウェイの作成"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "GPSトラックを編集するためのレイヤーです。"
@@ -8644,11 +8717,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "GPXレイヤーからパスをインポート"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "今あるパスをドロップ"
@@ -8657,6 +8730,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "GPXデータのレイヤーがありません"
@@ -8719,6 +8792,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "リフレッシュ"
@@ -8754,5 +8827,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
 msgid "Importing data from DG100..."
-msgstr "DG100からデータのインポート"
+msgstr "DG100からデータのインポートしています..."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
@@ -9028,7 +9101,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "水域(湖沼)"
@@ -9111,4 +9184,6 @@
 "lines). Default 50000."
 msgstr ""
+"データを間引く前（つまり、ラインを単純化する前）に、生成させるノードの最大"
+"数。デフォルト値は50000。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
@@ -9153,5 +9228,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr ""
+msgstr "軌跡をたどるのにどのWMSレイヤを使用しますか。デフォルトは IR1です。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
@@ -9361,14 +9436,14 @@
 "ん。"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugsを開く"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9498,19 +9573,21 @@
 msgstr "許可されたアクション"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+"APIを通じて、リモートコントロールプラグインによって、データをロードするよう要"
+"求されました。"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "リクエストの詳細: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "本当にこれを許可してよろしいですか？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9569,5 +9646,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
 msgid "Reverse route"
-msgstr ""
+msgstr "ルートの逆転"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
@@ -9593,5 +9670,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
 msgid "Weight"
-msgstr ""
+msgstr "重み付け"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -9636,7 +9713,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "アップロード中..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9771,5 +9847,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
 msgid "<multiple>"
-msgstr ""
+msgstr "<multiple>"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
@@ -9824,14 +9900,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 ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "TCXファイルをインポート"
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "TCXファイルをTCXファイルとしてインポート"
+msgstr "まず、設定情報にある現在のソースのタグを指定してください。"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10018,5 +10085,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "エリアの結合：　短いウェイの削除"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -10040,34 +10107,34 @@
 msgstr "特定の場所へジャンプできるダイアログを開始"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "移動する位置の緯度経度を入力"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "www.openstreetmap.orgから、URLを貼り付けることもできます。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "ズーム（メートル単位）"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "そこへジャンプ"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "ジャンプ先は"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 "緯度、経度、ズームを解析することができませんでした。確認をしてください。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "緯度経度を解釈できません"
@@ -10136,5 +10203,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use the error layer to display problematic elements."
-msgstr ""
+msgstr "疑わしい要素を表示するために、エラーレイヤを使用"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
@@ -10375,23 +10442,23 @@
 msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "プロパティチェッカー："
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "タグチェッカーライン - {0}: {1}　が不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "スペルチェック行 {0}が不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10402,5 +10469,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "不正なタグ/値の組み合わせです"
@@ -10408,78 +10475,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "色つけに問題発生"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "キー ''{0}''は不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "値のないタグ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "プロパティキーが不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "プロパティのキーとして、不正なスペースが入っています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "値で、空白文字を最初か最後にあるプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "HTML書式の値を持つプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "キー ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "プリセットはプロパティキーを含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "値 ''{0}'' キー ''{1}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "プリセットは属性値を含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "プロパティのキーをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "高度なプロパティチェッカーを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "タグチェッカーのソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10487,74 +10554,84 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "新しいソースをリストに追加"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "選択したソースの編集"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "データソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "プロパティの値をチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "FIXMEをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "プロパティの値としてFIXMEをもつノードやウェイを検索"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Check for paint notes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "既定のデータファイルを使用。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "既定のデータファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "既定のデータファイルを使用。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "既定のデータファイルを使用(推奨)"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "既定のスペルチェックファイルを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "既定のスペルチェックファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "プロパティを修正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "要素タイプを見つけられませんでした。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "警告レベルを見つけられませんでした"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不正な表現\"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10699,7 +10776,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "ビル"
@@ -10713,5 +10790,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "領域"
@@ -10721,25 +10798,25 @@
 msgstr "閉じていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "つながっていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "ウエイは他の高速道路の近くでノードで終わっています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "ウェイは他のウェイの近くでノードで終わっています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "ほかのウェイに近いウェイのノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10762,17 +10839,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "名前のないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "ジャンクションの編集"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "タグ付いていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "空のウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "ノードが一つのウェイ"
@@ -10792,9 +10874,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
 msgid "Reversed water: land not on left side"
-msgstr ""
+msgstr "水域の反転： 陸地は左側にない"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
 msgid "Reversed land: land not on left side"
-msgstr ""
+msgstr "陸地の反転：　陸地は左側にない"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
@@ -10810,14 +10892,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "例外が発生しました"
@@ -10915,5 +10997,5 @@
 msgstr "選択されたWMSレイヤーの位置を調整してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10926,15 +11008,15 @@
 msgstr "自動ダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -10942,102 +11024,91 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "ファイルからデータをロードするためのブランクWMSレイヤを開く"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "WMSプラグイン設定"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "WMSプラグインメニューに表示されるWMS サーバのリストを変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "メニューの名前"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "メニュー名(既定)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (既定)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "メニュー名とWMS URLを入力"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "既定のコピー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "コピーする列を選択してください。"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "ダウンロード"
 
 #. *
@@ -11088,4 +11159,6 @@
 "import EXIF geotagged pictures."
 msgstr ""
+"標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれたジ"
+"オタグを関連づけします。"
 
 #. Plugin cadastre-fr
@@ -11119,4 +11192,5 @@
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
+"様々なフォーマットのファイルを JOSM に直接インポートできるようにします。"
 
 #. Plugin DirectUpload
@@ -11162,5 +11236,5 @@
 #: build/trans_plugins.java:27
 msgid "Helps vectorizing WMS images."
-msgstr ""
+msgstr "WMS イメージのベクトル化を支援する"
 
 #. Plugin livegps
@@ -11177,4 +11251,6 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
+"選択したパスの長さ、角度、簡単な領域内の面積を表示するダイアログとレイヤーを"
+"追加します。"
 
 #. Plugin nearclick
@@ -11195,4 +11271,6 @@
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
+"OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにしま"
+"す。"
 
 #. Plugin openvisible
@@ -11207,4 +11285,6 @@
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
+"現在表示されているスクリーンを、きれいなSVG画像として表示されるように、"
+"Firefoxを起動する。"
 
 #. Plugin PicLayer
@@ -11245,5 +11325,5 @@
 #: build/trans_plugins.java:55
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
+msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
@@ -11255,16 +11335,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "直接JOSMからのTCXファイルをロードしてください。"
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr "一つのブロックからテラスハウスを作成する"
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11273,5 +11348,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11280,5 +11355,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11287,10 +11362,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12014,5 +12089,5 @@
 #: build/trans_presets.java:261
 msgid "alley"
-msgstr ""
+msgstr "裏通り・路地"
 
 #: build/trans_presets.java:261
@@ -12086,4 +12161,64 @@
 msgid "Access"
 msgstr "アクセス"
+
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "はい"
 
 #. color permissive
@@ -12108,5 +12243,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "私道"
@@ -12154,5 +12289,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "行き先"
@@ -12189,7 +12324,7 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
-msgstr ""
+msgstr "関係車両のみ可"
 
 #: build/trans_presets.java:312 build/trans_presets.java:316
@@ -12207,7 +12342,31 @@
 msgstr "農業の"
 
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "いいえ"
+
 #: build/trans_presets.java:315
 msgid "Goods"
-msgstr ""
+msgstr "貨物トラック"
 
 #: build/trans_presets.java:316
@@ -12419,6 +12578,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "高速道路"
@@ -12444,6 +12603,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "国道"
@@ -12469,6 +12628,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "都道府県道"
@@ -12494,6 +12653,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "主要道路"
@@ -12507,5 +12666,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "敷地内道路"
@@ -12523,5 +12682,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "敷地内道路"
@@ -12539,5 +12698,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "サービス"
@@ -12564,6 +12740,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "工事中"
@@ -12613,5 +12789,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -12724,5 +12900,5 @@
 #: build/trans_presets.java:619
 msgid "sand"
-msgstr ""
+msgstr "砂地"
 
 #. item "Ways/Track" text "Width (meters)"
@@ -13282,10 +13458,10 @@
 #: build/trans_presets.java:868
 msgid "Spikes"
-msgstr ""
+msgstr "車止めのとげ"
 
 #. item
 #: build/trans_presets.java:869
 msgid "Edit Spikes"
-msgstr ""
+msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
@@ -13593,5 +13769,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "沼地、湿地"
@@ -15322,27 +15498,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "スポーツ"
@@ -18181,8 +18357,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "自転車"
@@ -18251,8 +18427,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "徒歩"
@@ -18278,5 +18454,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "地下鉄"
@@ -18300,5 +18476,5 @@
 #: build/trans_presets.java:3002
 msgid "alternate"
-msgstr ""
+msgstr "代替路"
 
 #: build/trans_presets.java:3002
@@ -18339,10 +18515,10 @@
 #: build/trans_presets.java:3010
 msgid "forward halt point"
-msgstr ""
+msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
 #: build/trans_presets.java:3011
 msgid "backward halt point"
-msgstr ""
+msgstr "後方の停止点"
 
 #. <!--
@@ -18406,4 +18582,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18412,4 +18589,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18418,4 +18596,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18424,4 +18603,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18485,7 +18665,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "橋"
@@ -18543,4 +18723,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18666,7 +18847,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18749,15 +18930,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "破棄された"
@@ -18799,5 +18980,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "馬"
@@ -19007,11 +19188,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -19049,6 +19230,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "ストリート"
@@ -19104,7 +19285,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "車線"
@@ -19160,8 +19341,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "線路"
@@ -19182,5 +19363,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19194,5 +19375,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19213,5 +19394,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "転回所"
@@ -19226,5 +19407,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19239,5 +19420,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "川岸"
@@ -19251,5 +19432,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "小川"
@@ -19263,5 +19444,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "ドック"
@@ -19289,5 +19470,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "水道"
@@ -19455,13 +19636,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "人工物"
@@ -19523,7 +19704,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19546,10 +19727,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "その他の軌道"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19569,7 +19750,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19577,8 +19761,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "古い軌道"
@@ -19623,6 +19811,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "空路"
@@ -19636,5 +19824,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "駅"
@@ -19656,5 +19844,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
@@ -19668,5 +19856,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "空路（明色）"
@@ -19714,7 +19902,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "リフト"
@@ -19731,5 +19919,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "初球者スキーコース"
@@ -19744,5 +19932,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "中級者スキーコース"
@@ -19757,5 +19945,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "上級者スキーコース"
@@ -19770,5 +19958,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "熟練者用のゲレンデ"
@@ -19783,5 +19971,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "フリースタイルのゲレンデ"
@@ -19796,5 +19984,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "初心者スキーゲレンデ"
@@ -19899,10 +20087,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "電力"
@@ -19916,5 +20104,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "桟橋"
@@ -19928,5 +20116,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "パイプライン"
@@ -20054,12 +20242,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "レジャー"
@@ -20073,5 +20261,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "マリーナ"
@@ -20143,8 +20331,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "アメニティ"
@@ -20246,10 +20434,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
@@ -20635,22 +20823,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -20682,6 +20870,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "信号_水域"
@@ -20742,8 +20930,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "健康"
@@ -21096,26 +21284,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "店"
@@ -21187,8 +21375,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "ホテル"
@@ -21338,9 +21526,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "旅行関係"
@@ -21412,8 +21600,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "史跡"
@@ -21484,8 +21672,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "緑"
@@ -21499,5 +21687,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "石切り場"
@@ -21511,5 +21699,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "埋め立て地"
@@ -21531,5 +21719,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -21543,5 +21731,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "森"
@@ -21555,5 +21743,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "農地"
@@ -21576,5 +21764,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "小売りの商用地"
@@ -21588,5 +21776,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "工業地"
@@ -21600,5 +21788,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -21612,5 +21800,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "緑地"
@@ -21624,5 +21812,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "鉄道公園"
@@ -21679,7 +21867,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "軍用地"
@@ -21693,5 +21881,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "墓地"
@@ -21704,5 +21892,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "山頂"
@@ -21717,5 +21905,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "氷河"
@@ -21729,5 +21917,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "火山"
@@ -21782,8 +21970,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "自然"
@@ -21797,5 +21985,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "低木"
@@ -21809,5 +21997,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "荒地"
@@ -21821,5 +22009,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "森"
@@ -21833,5 +22021,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "泥"
@@ -21845,5 +22033,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "砂浜"
@@ -21921,8 +22109,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "ルート"
@@ -21970,7 +22158,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "行政区境"
@@ -22112,10 +22300,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "場所"
@@ -22163,6 +22351,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "住所"
@@ -22393,10 +22581,10 @@
 msgstr "ランドサット"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "オープンエアリアルマップ"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22404,5 +22592,5 @@
 msgstr "NPEマップ"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22410,62 +22598,136 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMapデータ"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "米Yahoo (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "自転車道"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "米Yahoo (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Streets NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "データレイヤー"
+
+#~ msgid "Change"
+#~ msgstr "更新"
+
+#~ msgid "Rotate"
+#~ msgstr "回転"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ"
-#~ "ロードされた要素だけに遍歴があります。"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。"
+#~ "投影法\"{0}\"は、緯度が46.1°から57°の\n"
+#~ "間で使われるように設計されています。\n"
+#~ "フランスのWMSサーバをつかうのではなければ、\n"
+#~ "ほかの投影法を使用してください。\n"
+#~ "本メッセージ後は、データのアップロードはやめてください。"
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "投影法 \"{0}\" は、\n"
+#~ "緯度 45.7°から 47.9°で\n"
+#~ "経度  5.7°から 10.6°まで用です。\n"
+#~ "スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n"
+#~ "違う投影系を使ってください。\n"
+#~ "このメッセージ以降のデータはアップロードしないでください。"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "競合: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "事前に設定した情報源をタグ付け"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し"
+#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "新しいタグプリセット源をリストに追加する。"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "事前設定の情報源をタグ付け"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "TCXファイルをインポート"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "TCXファイルをTCXファイルとしてインポート"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "直接JOSMからのTCXファイルをロードしてください。"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "米Yahoo (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "米Yahoo (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "アップロードするデータ"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "まだ実装されていません。"
+
 #~ msgid "Email"
 #~ msgstr "Email"
@@ -22473,4 +22735,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "競合の解決"
+
+#~ msgid "Object"
+#~ msgstr "オブジェクト"
 
 #~ msgid "{0} object has conflicts:"
@@ -22510,4 +22775,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "{1}個のオブジェクト中の{0}個の競合を解決"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "リストを更新するために再読込のクリック"
+
+#~ msgid "Revert"
+#~ msgstr "取り消す"
+
+#~ msgid "Date"
+#~ msgstr "日付"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン"
+#~ "へと戻します。"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22628,4 +22909,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ"
+#~ "ロードされた要素だけに遍歴があります。"
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -22672,2 +22960,5 @@
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "不明な理由でデータのアップロードに失敗しました。"
+
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 16400)
+++ applications/editors/josm/i18n/po/nb.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-19 22:13+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-02 16:44+0000\n"
+"Last-Translator: Stian Ellingsen <stiell@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:16+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
-msgstr "Bygger opp hoved skjermbilde"
+msgstr "Bygger opp hovedskjermbilde"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +32,32 @@
 msgstr "Hjelp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+"Kunne ikke lese projeksjon fra innstillinger. Bruker Mercators projeksjon."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Tips: Noen endringer kom fra å laste opp nye data til serveren."
-
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Ulagrede endringer"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
-msgstr "Det er ulagrede endringer. Forkast endringene og fortsette?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+msgstr "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Lagre og avslutt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
-msgstr "Slett forandringer og avslutt"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+msgstr "Forkast og avslutt"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Overser feilutformet URL: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+msgstr "Overser feilutformet URL: «{0}»"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Overser feilutformet fil URL: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+msgstr "Overser feilutformet fil-URL: «{0}»"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "Ukjent"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Om"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Om programmet"
@@ -131,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Siste endring på {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Feilrapporter"
@@ -170,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +179,27 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Les meg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revisjon"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Bidrag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Om JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Filen finnes ikke."
@@ -208,14 +211,15 @@
 "OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere "
+"riktig til historikkside for OSM-element. API-URL er «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Velg minst en lukket linje å sammenføye med."
+msgstr "Velg minst én allerede opplastet node, linje eller relasjon."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Advarsel"
@@ -227,4 +231,5 @@
 "primitives only"
 msgstr ""
+"ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -232,9 +237,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53
 msgid "Add Node..."
-msgstr "Legg til node..."
+msgstr "Legg til node …"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 msgid "Add a node by entering latitude and longitude."
-msgstr "Legg til en node ved å taste inn lengdegrad og breddegra"
+msgstr "Legg til en node ved å skrive inn lengde- og breddegrad."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
@@ -261,14 +266,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38
 msgid "Use decimal degrees."
-msgstr "Bruk desimale grader."
+msgstr "Bruk desimalgrader."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39
 msgid "Negative values denote Western/Southern hemisphere."
-msgstr "Negative verdier betegner vestlige / sørlige hemisfæren."
+msgstr "Negative verdier betegner den vestlige/sørlige hemisfæren."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Breddegrad"
@@ -277,5 +282,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Lengdegrad"
@@ -283,5 +288,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Juster nodene til en sirkel"
@@ -289,10 +294,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 msgid "Move the selected nodes into a circle."
-msgstr "Flytt de valgte noder i en sirkel."
+msgstr "Flytt de valgte nodene i en sirkel."
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -338,5 +343,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 msgid "Move the selected nodes in to a line."
-msgstr "Flytt valgte noder til en linje."
+msgstr "Flytt valgte noder til en rett linje."
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59
@@ -351,18 +356,19 @@
 "{0}, max is {1}"
 msgstr ""
+"Gjeldende antall endringer overstiger maksimalt antall endringer: gjeldende "
+"er {0}, maksimalt er {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "API-krav ikke møtt"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "Klarte ikke starte API. Prøv igjen senere."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Ikke startet"
+msgstr "Klarte ikke starte API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -372,4 +378,5 @@
 "{1}"
 msgstr ""
+"Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
@@ -379,48 +386,49 @@
 "length {2}. Values length is {3}."
 msgstr ""
+"Verdiens lengde for egenskap «{0}» i objekt {1} overstiger maksimalt tillatt "
+"lengde {2}. Verdiens lengde er {3}."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Relasjonen har konflikter"
+msgstr "Forhåndsbetingelse brutt"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "last ned"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
-msgstr "Zoom til {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+msgstr "Gå til {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
-msgstr "Zoom skjermbilde til {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+msgstr "Skaler og flytt skjermbildet til {0}."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -430,9 +438,9 @@
 msgstr "Bilde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Inet utvalg å vise."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Ingen konflikter å vise."
@@ -441,9 +449,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
-msgstr "Sammenføy Linjer"
+msgstr "Sammenføy linjer"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
-msgstr "Sammenføy flere Linjer til en"
+msgstr "Sammenføy flere linjer til én"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67
@@ -467,5 +475,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141
 msgid "Change directions?"
-msgstr "Endre rettninger?"
+msgstr "Endre retninger?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142
@@ -474,5 +482,6 @@
 "reverse some of them?"
 msgstr ""
-"Linjene har forkjellig retning. Kan ikke sammenføyes. Vil du snu på linjene?"
+"Linjene har forskjellig retning og kan ikke sammenføyes. Vil du snu "
+"retningen på noen av linjene?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -491,5 +500,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
 msgid "Solve Conflicts"
-msgstr "Løs konflikt"
+msgstr "Løs konflikter"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
@@ -515,5 +524,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
 msgid "Copy selected objects to paste buffer."
-msgstr "Kopier valgte objekt for til utklippstavle"
+msgstr "Kopier valgte objekter til utklippstavla."
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134
@@ -521,37 +530,41 @@
 msgstr "Velg noe å kopiere."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Lag en sirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Lag en sirkel fra tre valgte noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Velg kun tre noder eller en linje med kun tre noder."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Valgte noder er ikke i en sirkel."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Velg kun tre noder eller en linje med kun tre noder."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Slett"
@@ -573,5 +586,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98
 msgid "File exists. Overwrite?"
-msgstr "Filen finnes. Overskrive filen ?"
+msgstr "Filen finnes. Vil du overskrive filen?"
 
 #. Do it!
@@ -589,9 +602,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download from OSM..."
-msgstr "Last ned fra OSM..."
+msgstr "Last ned fra OSM …"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download map data from the OSM server."
-msgstr "Last ned kartdata fra OSM server."
+msgstr "Last ned kartdata fra OSM-tjeneren."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
@@ -601,5 +614,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -612,14 +625,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69
 msgid "Please select at least one task to download"
-msgstr "Velg minst en oppgave å laste ned"
+msgstr "Velg minst én oppgave å laste ned"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24
 msgid "Duplicate"
-msgstr "Dubliser"
+msgstr "Fordoble"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
 msgid "Duplicate selection by copy and immediate paste."
-msgstr "Dupliser utvalget med kopier og lim inn (straks etter)"
+msgstr "Fordoble utvalget ved å kopiere og umiddelbart lime inn."
 
 #. <button label="Info" hotkey="I">
@@ -642,5 +655,5 @@
 "tracks."
 msgstr ""
-"Merk: GPL er ikke kompatibelt med OSM lisens. Ikke last opp GPL lisensierte "
+"Merk: GPL er ikke kompatibel med OSM-lisensen. Ikke last opp GPL-lisensierte "
 "spor."
 
@@ -648,9 +661,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Export to GPX..."
-msgstr "Eksporter til GPX ..."
+msgstr "Eksporter til GPX …"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 msgid "Export the data to GPX file."
-msgstr "Eksporter dataene til GPX fil."
+msgstr "Eksporter dataene til GPX-fil."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55
@@ -664,5 +677,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85
 msgid "Add author information"
-msgstr "legg til info om opphavsmann"
+msgstr "Legg til informasjon om opphavsperson"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
@@ -672,9 +685,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
 msgid "E-Mail"
-msgstr ""
+msgstr "E-post"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
 msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
+msgstr "Opphavsrett (URL)"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100
@@ -684,5 +697,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102
 msgid "Copyright year"
-msgstr "Kopibeskyttet år:"
+msgstr "År for opphavsrett"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
@@ -696,5 +709,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124
 msgid "Export and Save"
-msgstr "Eksporter og Lagre"
+msgstr "Eksporter og lagre"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
@@ -708,11 +721,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -723,5 +737,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Feil"
@@ -731,30 +745,30 @@
 msgstr "Velg en lisens"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM hjelpesider"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
-msgstr "Åpne i internettleser"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+msgstr "Åpne i nettleser"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
-msgstr "Rediger"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+msgstr "Endre"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -762,19 +776,19 @@
 msgstr "Last inn på nytt"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Du kan bare redigere hjelpesider fra JOSM Online Help"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Feil ved nedlasting av {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -782,25 +796,24 @@
 "\">your language</A>."
 msgstr ""
+"Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A> eller <A HREF="
+"\"{1}\">norsk (bokmål)</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
 msgid "History of Element"
-msgstr "Historikk på Elementet"
+msgstr "Historikk for elementet"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Vis historikk på OSM linjer eller noder."
+msgstr "Vis historikk for OSMs noder, linjer eller relasjoner."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Historikk på Elementet"
+msgstr "Informasjon om element"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Vis historikk på OSM linjer eller noder."
+msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -819,5 +832,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30
 msgid "No Shortcut"
-msgstr "Ingen Hurtigtast"
+msgstr "Ingen hurtigtast"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
@@ -861,15 +874,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
-msgstr ""
+msgstr "Speilvend"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 msgid "Mirror selected nodes and ways."
-msgstr ""
+msgstr "Speilvend valgte noder og linjer"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
 msgid "Please select at least one node or way."
-msgstr ""
+msgstr "Velg minst én node eller linje."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
@@ -898,10 +911,10 @@
 msgstr "høyre"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Flytt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -909,7 +922,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
-msgstr "Kan ikke flytte objekt ut i verdensrommet"
+msgstr "Kan ikke flytte objekter utenfor kartet."
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
@@ -944,10 +957,10 @@
 #, java-format
 msgid "Could not read \"{0}\""
-msgstr "Kan ikke lese {0}"
+msgstr "Klarte ikke lese «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
 msgid "Open Location..."
-msgstr "Åpne Sted"
+msgstr "Åpne sted …"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -957,5 +970,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
 msgid "Separate Layer"
-msgstr "Separat Lag"
+msgstr "Separat lag"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
@@ -965,5 +978,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
 msgid "Download Location"
-msgstr "Last ned Sted"
+msgstr "Last ned sted"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
@@ -1002,11 +1015,11 @@
 "projection to get rid of this warning.<br>Do you want to continue?"
 msgstr ""
-"<html>Du har valgt EPSG:4326 projecsjon som kan gi uønsket<br>resultat ved "
-"vinkling til rette vinkler.<br>Bytt projeksjon for å unngå denne "
-"advarselen<br>Fortsett?"
+"<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:106
 msgid "Only one node selected"
-msgstr "Bare en node er valgt"
+msgstr "Bare én node er valgt"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243
@@ -1022,5 +1035,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
 msgid "Paste contents of paste buffer."
-msgstr "Lim inn fra utklippstavle"
+msgstr "Lim inn fra utklippstavla."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
@@ -1028,13 +1041,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79
 msgid "Paste Tags"
-msgstr "Lim inn Egenskaper"
+msgstr "Lim inn egenskaper"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
 msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "Bruk egenskaper i utklippstavle på alle valgte element."
+msgstr "Bruk egenskaper i utklippstavla på alle valgte element."
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
 msgid "Preferences..."
-msgstr "Innstillinger..."
+msgstr "Innstillinger …"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
@@ -1045,14 +1058,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
 msgid "Preferences"
-msgstr "Alternativer"
+msgstr "Innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo"
-msgstr "Gjenopprett"
+msgstr "Gjør om"
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 msgid "Redo the last undone action."
-msgstr "Gjenopprett siste angre."
+msgstr "Gjør om siste angrede handling."
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
@@ -1068,10 +1081,10 @@
 #, java-format
 msgid "Could not rename the file \"{0}\"."
-msgstr "Kan ikke gi nytt navn til fila \"{0}\""
+msgstr "Klarte ikke gi nytt navn til fila «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
-msgstr "Snu retning på linje"
+msgstr "Snu retning på linjer"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1081,5 +1094,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56
 msgid "Please select at least one way."
-msgstr "Velg minst en linje"
+msgstr "Velg minst én linje"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
@@ -1094,12 +1107,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 msgid "Save the current data."
-msgstr "Lagre data"
+msgstr "Lagre gjeldende data."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #, java-format
 msgid "File {0} exists. Overwrite?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+msgstr "Filen {0} finnes allerede. Vil du skrive over den?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1108,65 +1121,64 @@
 "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Ingen åpne dokument å lagre"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dokumentet er tomt."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Lagre uansett"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
 "if you rejected all. Continue?"
 msgstr ""
-"Det finnes konflikter som må løses. Element med konflikter lagres ikke. "
-"Fortsett?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+"Det finnes konflikter som må løses. Element med konflikter lagres ikke. Vil "
+"du fortsette?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
-msgstr "Avvis Konflikter og Lagre"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+msgstr "Avvis konflikter og lagre"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
-msgstr "Lagre OSM fil"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+msgstr "Lagre OSM-fil"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
-msgstr "Lagre GPX fil"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgstr "Lagre GPX-fil"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+msgstr "Lagre lag"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Kan ikke ta sikkerhetskopi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Ukjent filtype."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Det oppsto feil under lagring."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Det oppsto feil under gjenoppretting fra sikkerhetskopi."
@@ -1175,9 +1187,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 msgid "Save As..."
-msgstr "Lagre som..."
+msgstr "Lagre som …"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 msgid "Save the current data to a new file."
-msgstr "Lagre aktive data i ny fil"
+msgstr "Lagre aktive data i ny fil."
 
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
@@ -1196,5 +1208,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show Status Report"
-msgstr "Vis Statusrapport"
+msgstr "Vis statusrapport"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
@@ -1213,9 +1225,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
 msgid "Copy to clipboard and close"
-msgstr "Kopier til utklippstavlen og Lukk"
+msgstr "Kopier til utklippstavlen og lukk"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Lukk"
@@ -1228,5 +1241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
-msgstr "Splitt linje i valgt Node"
+msgstr "Splitt en linje i den valgte noden."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
@@ -1247,6 +1260,6 @@
 "There is more than one way using the nodes you selected. Please select the "
 "way also."
-msgstr[0] "Mer enn en linje bruker den  valgte Noden. Velg flere linjer."
-msgstr[1] "Mer enn en linje bruker de valgte Nodene. Velg flere linjer."
+msgstr[0] "Mer enn én linje bruker den  valgte noden. Velg flere linjer."
+msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
@@ -1278,14 +1291,13 @@
 "You should verify this and correct it when necessary."
 msgstr ""
-"Medlemskap i en Relasjon basert på en Rolle er kopiert til alle nye linjer\n"
+"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:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Medlemskap i en Relasjon basert på en Rolle er kopiert til alle nye linjer\n"
+"Et relasjonsmedlemskap  er kopiert til alle nye linjer.\n"
 "Sjekk og korriger slik at dette er riktig."
 
@@ -1298,14 +1310,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Toggle GPX Lines"
-msgstr "Slå GPX linjer av - på"
+msgstr "Slå av/på GPX-linjer"
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 msgid "Draw lines between raw gps points."
-msgstr "Trekk linjer mellom GPS-punkt"
+msgstr "Trekk linjer mellom GPS-punkt."
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #, java-format
 msgid "Toggles the global setting ''{0}''."
-msgstr "Slå av/på global settings ''{0}''."
+msgstr "Slår av/på global innstilling «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
@@ -1336,5 +1348,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112
 msgid "Select either:"
-msgstr "Velg :"
+msgstr "Velg:"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
@@ -1344,9 +1356,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "* One node that is used by more than one way, or"
-msgstr "* En node som brukes av flere linjer, eller"
+msgstr "– En node som brukes av flere linjer, eller"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
 msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr "* En node som er brukt av flere linjer, og en av linjene, eller"
+msgstr "– En node som er brukt av flere linjer, og en av linjene, eller"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
@@ -1354,10 +1366,10 @@
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
-"* En linje som har en eller flere noder, som er brukt av flere linjer eller"
+"– En linje som har en eller flere noder, som er brukt av flere linjer, eller"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
-msgstr "* En linje, og en eller flere av nodene som er brukt i flere linjer."
+msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
@@ -1368,7 +1380,7 @@
 "own copy and all nodes will be selected."
 msgstr ""
-"OBS: Når du velger en linje, vil denne få nye kopier av noder uten  \n"
-"tilknytninger og nodene vil bli valgt. Ellers vil alle linjer vil få egne \n"
-"kopier og alle noder blir valgt."
+"Merk: Når du velger en linje, vil denne få nye kopier av noder uten\n"
+"tilknytninger og nodene bli valgt. Ellers vil alle linjer få egne\n"
+"kopier og alle noder bli valgt."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157
@@ -1394,5 +1406,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
-msgstr "Angre siste aksjon."
+msgstr "Angre siste handling."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
@@ -1405,5 +1417,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
-msgstr "Fjern objekt fra utvalg."
+msgstr "Fjern alle objekter fra utvalg."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
@@ -1418,9 +1430,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
 msgid "Update Data"
-msgstr "Oppdater Data"
+msgstr "Oppdater data"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
 msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr "Oppdaterer aktuelt data lag fra server (laster ned på nytt)"
+msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:63
@@ -1431,100 +1443,100 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
 msgid "Failed to update the selected primitives."
-msgstr ""
+msgstr "Klarte ikke oppdatere valgte objekter."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
 msgid "Update failed"
-msgstr ""
+msgstr "Oppdatering feilet"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71
 #, java-format
 msgid "Could not find primitive with id {0} in the current dataset"
-msgstr ""
+msgstr "Fant ikke objekt med ID {0} i gjeldende datasett"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
 msgid "Missing primitive"
-msgstr ""
+msgstr "Mangler objekt"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
 msgid "Update Selection"
-msgstr ""
+msgstr "Oppdater utvalg"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
 msgid "Updates the currently selected primitives from the server"
-msgstr ""
+msgstr "Oppdaterer de valgte objektene fra tjeneren"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
 msgid "There are no selected primitives to update."
-msgstr ""
+msgstr "Det er ingen valgte objekter å oppdatere"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "Selection empty"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+msgstr "Utvalget er tomt"
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
-msgstr "Last opp til OSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+msgstr "Last opp til OSM …"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
-msgstr "Last opp alle endringer til OSM serveren."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+msgstr "Last opp alle endringer til OSM-tjeneren."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Objekter som legges til:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Objekter som endres:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Objekter som slettes:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Gi en kort kommentar for endringene du laster opp:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Laste opp disse endringene?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Last opp endringer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Ingen endringer å laste opp. Finn frem data først."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Data inneholder uløste konflikter som først må løses."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Ingen endringer å laste opp."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+msgstr "Laster opp"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+msgstr "Oppdaterer objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+msgstr "Synkroniser kun {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+msgstr "Synkroniser hele datasettet"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1537,18 +1549,25 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+"<html>Upplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
+"av en<br>lokal node, linje eller relasjon.<br>Konflikten er forårsaket av "
+"<strong>{0}</strong> med ID <strong>{1}</strong>,<br>tjeneren har versjon "
+"{2}, lokal versjon er {3}.<br><br>Trykk <strong>{4}</strong> for å "
+"synkronisere kun konfliktelementet.<br>Trykk <strong>{5}</strong> for å "
+"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{6}</"
+"strong> for å gå tilbake og fortsette å redigere.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
-msgstr ""
+msgstr "Konflikt oppdaget"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+msgstr "Uventet returverdi. Mottok {0}."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1558,11 +1577,15 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+"<html>Opplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
+"av en node, linje ellerrelasjon.<br><br>Trykk <strong>{0}</strong> for å "
+"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{1}</"
+"strong> for å avbryte operasjonen og fortsette å redigere.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1571,10 +1594,12 @@
 "html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+"<html>Opplasting til tjeneren <strong>feilet</strong> fordi nåværende "
+"datasett<br>bryter en forhåndsbetingelse.<br>Feilmelding:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+msgstr "Forhåndsbetingelse brutt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1583,19 +1608,22 @@
 "<br>{0}</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+"<html>Opplasting <strong>feilet</strong> fordi et element du prøvde "
+"å<br>slette allerede er slettet på tjeneren.<br><br>Feilmelding:<br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+msgstr "Objekt allerede slettet"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+msgstr "Klarte ikke laste opp til OSM-API"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1603,4 +1631,6 @@
 "Check the server URL in your preferences and your internet connection."
 msgstr ""
+"Klarte ikke starte kommunikasjonen med OSM-tjener {0}.\n"
+"Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker."
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -1686,38 +1716,29 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
 msgid "Slower Forward"
-msgstr "Spill av Sakte"
+msgstr "Spill av sakte"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
 msgid "Downloading GPS data"
-msgstr "Laster ned GPS data"
+msgstr "Laster ned GPS-data"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47
 msgid "Downloaded GPX Data"
-msgstr "Laster ned GPX data"
+msgstr "Laster ned GPX-data"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78
 msgid "Raw GPS data"
-msgstr "GPS rådata"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+msgstr "GPS-rådata"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
-msgstr "Last ned data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+msgstr "Laster ned data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Ingenting er importert."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Data Lag {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
-msgstr "OpenStreetMap data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Data Lag"
+msgstr "OpenStreetMap-data"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1728,9 +1749,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
 msgid "The following errors occurred during mass download:"
-msgstr ""
+msgstr "Følgende feil oppstod under massenedlasting:"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
 msgid "Errors during Download"
-msgstr "Feil under nedlasting:"
+msgstr "Feil under nedlasting"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
@@ -1743,8 +1764,13 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
+"<html>Det er {0} elementer i det lokale datasettet som<br>kan være slettet "
+"på tjeneren. Hvis du senere prøver å slette<br>eller oppdatere dem, vil "
+"tjeneren sannsynligvis rapportere om en<br>konflikt.<br><br>Trykk <strong>{1}"
+"</strong> for å sjekke status for disse elementene<br>på tjeneren.<br>Trykk "
+"<strong>{2}</strong> for å ignorere.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
 msgid "Deleted or moved primitives"
-msgstr ""
+msgstr "Slettede eller flyttede objekter"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1754,10 +1780,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
 msgid "Delete nodes or ways."
-msgstr "Slett Noder eller Linjer"
+msgstr "Slett noder eller linjer."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1770,6 +1796,6 @@
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
-"Klikk for sletting. Shift: slett linje segment. Alt: Ikke slett ubrukte "
-"Noder ved sletting av linjer. Ctrl: slett objekt med referanse."
+"Klikk for å slette. Shift: slett linjesegment. Alt: Ikke slett ubrukte noder "
+"når linjer slettes. Ctrl: slett objekt med referanse."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
@@ -1781,5 +1807,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
 msgid "Draw nodes"
-msgstr "Digitaliser Noder"
+msgstr "Tegn noder"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
@@ -1795,5 +1821,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336
 msgid "Cannot add a node outside of the world."
-msgstr "Kan ikke velge Node fra verdensrommet."
+msgstr "Kan ikke legge til node utenfor kartet."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
@@ -1803,26 +1829,26 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node into way"
-msgstr "Legg til Node i linje"
+msgstr "Legg til node i linje"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
 msgid "Connect existing way to node"
-msgstr "Knytt eksisterende linje til Node"
+msgstr "Knytt eksisterende linje til node"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Add a new node to an existing way"
-msgstr "Legg til en Node i eksisterende linje"
+msgstr "Legg til en node i eksisterende linje"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add node into way and connect"
-msgstr "Legg til Node i linje og lag tilknytning"
+msgstr "Legg til node i linje og lag tilknytning"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881
 msgid "Create new node."
-msgstr "Lag ny Node"
+msgstr "Lag ny node."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908
 msgid "Select node under cursor."
-msgstr "Veg Node ved markøren."
+msgstr "Veg node under pekeren."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
@@ -1830,14 +1856,14 @@
 msgid "Insert new node into way."
 msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Sett inn ny Node i linje."
-msgstr[1] "Sett inn ny Node i {0} linjer."
+msgstr[0] "Sett inn ny node i linje."
+msgstr[1] "Sett inn ny node i {0} linjer."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
 msgid "Start new way from last node."
-msgstr "Start ny linje fra siste Node."
+msgstr "Start ny linje fra siste node."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
 msgid "Continue way from last node."
-msgstr "Fortsett samme linje fra siste Node."
+msgstr "Fortsett samme linje fra siste node."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
@@ -1853,5 +1879,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
 msgid "Create areas"
-msgstr "Tegn arealer"
+msgstr "Tegn områder"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248
@@ -1860,7 +1886,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "Slipp museknapp for å velge objekt i rektangelet."
+msgstr "Slipp museknappen for å velge objektene i rektangelet."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
@@ -1869,5 +1895,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Slipp museknappen for å avslutte rotasjon."
@@ -1875,5 +1901,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267
 msgid "Drag a way segment to make a rectangle."
-msgstr "Trekk ut et segment av linje for å danne rektangel."
+msgstr "Dra et linjesegment for å lage et rektangel."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
@@ -1882,10 +1908,10 @@
 "+release to synchronize audio at that point."
 msgstr ""
-"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; SHIFT"
+"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; Shift"
 "+slipp synkroniserer audio i dette punktet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1893,16 +1919,39 @@
 msgstr "Velg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Velg, flytt og roter objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
 msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Legg til og flytt en kunstig Node til en linje"
-msgstr[1] "Legg til og flytt en kunstig Node til {0} linjer"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+msgstr[0] "Legg til og flytt en kunstig node til en linje"
+msgstr[1] "Legg til og flytt en kunstig node til {0} linjer"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Flytt til venstre"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Flytt til venstre"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Angre"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1911,5 +1960,5 @@
 "nærmeste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1927,13 +1976,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
 msgid "Zoom and move map"
-msgstr "Zoom and flytt kart"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+msgstr "Skaler og flytt kart"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
 msgstr ""
-"Zoom med  Ctrl+. or Ctrl+, eller trekking; flytt med Ctrl+opp, venstre, ned, "
-"høyre; flyttezoom med høyre museknapp"
+"Skaler med Ctrl + . og Ctrl + , eller venstre museknapp; flytt med Ctrl + "
+"piltaster; flytt utsnitt med høyre museknapp"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
@@ -1941,5 +1990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45
 msgid "Search..."
-msgstr "Søk ..."
+msgstr "Søk …"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
@@ -1956,5 +2005,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57
 msgid "Please enter a search string."
-msgstr "Søk etter teksten."
+msgstr "Skriv inn søketekst."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61
@@ -1972,25 +2021,25 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
 msgid "case sensitive"
-msgstr "skill på store / små bokstaver"
+msgstr "skill mellom store/små bokstaver"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
 msgid "regular expression"
-msgstr "vanlig uttrykk"
+msgstr "regulært uttrykk"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-msgstr "<b>Nansens gate</b> - 'Nansen' og 'gate' i nøkkel eller navn."
+msgstr "<b>Nansens gate</b> – «Nansens» og «gate» i nøkkel eller navn."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr "<b>Nansens gate</b> - \"Nansen\" og \"gate\" i nøkkel eller navn."
+msgstr "<b>\"Nansens gate\"</b> – «Nansens gate» i nøkkel eller navn."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr "<b>name:Nan</b> - 'Nan' finnes innen navn."
+msgstr "<b>name:Nan</b> – «Nan» finnes innen navnet."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
+msgstr "<b>type=route</b> – nøkkel «type» med eksakt verdi «route»."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
@@ -1999,12 +2048,14 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
+"<b>type=*</b> -– nøkkel «type» med hvilken som helst verdi. Prøv også "
+"<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr "<b>-name:Nan</b> - ingen 'Nan'  innen navn."
+msgstr "<b>-name:Nan</b> – «Nan» finnes ikke innen navnet."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr "<b>foot:</b> - key=foot kan ha alle verdier."
+msgstr "<b>foot:</b> – nøkkel «foot» med hvilken som helst verdi."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
@@ -2015,33 +2066,33 @@
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr "<b>type:</b> - type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr "<b>type:</b> – type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
 msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>user:</b>... - alle object redigert av bruker (user)"
+msgstr "<b>user:</b>… – alle objekter redigert av angitt bruker"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
 msgid "<b>id:</b>... - object with given ID"
-msgstr "<b>id:</b>... - objekt med gitt ID"
+msgstr "<b>id:</b>… – objekt med angitt ID"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
 msgid "<b>nodes:</b>... - object with given number of nodes"
-msgstr "<b>nodes:</b>... - objekt med bestemt antall noder (nodes)"
+msgstr "<b>nodes:</b>… – objekt med angitt antall noder"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
 msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - alle endrede objekt"
+msgstr "<b>modified</b> – alle endrede objekter"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - alle objekt i utvalg"
+msgstr "<b>selected</b> – alle objekter i utvalg"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - all uferdige (incomplete) objekt"
+msgstr "<b>incomplete</b> – alle uferdige objekter"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - alle objekt uten egenskaper (untagged)"
+msgstr "<b>untagged</b> – alle objekter uten egenskaper"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
@@ -2049,4 +2100,5 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
+"<b>child <i>uttrykk</i></b> – alle underobjekter av objektene i uttrykket"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
@@ -2054,17 +2106,19 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
+"<b>parent <i>uttrykk</i></b> – alle overobjekter av objektene i uttrykket"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Bruk <b>|</b> eller <b>OR</b> for søk med logisk ELLER (OR)"
+msgstr "Bruk <b>|</b> eller <b>OR</b> for søk med logisk <i>eller</i>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
-"Bruk <b>\"</b> for å vise til egenskapsnavn (f.eks hvis nøkkel inneholder :)"
+"Bruk <b>\"</b> for å søke etter operatortegn (f.eks. hvis nøkkel inneholder "
+"«:»)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Bruk parantes <b>(</b> and <b>)</b> ved grupper av uttrykk"
+msgstr "Bruk <b>(</b> og <b>)</b> for å gruppere uttrykk"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
@@ -2075,20 +2129,20 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Start Search"
-msgstr "Start Søk"
+msgstr "Start søk"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 #, java-format
 msgid "No match found for ''{0}''"
-msgstr "Fant ingen ''{0}''"
+msgstr "Fant ingen treff for «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
-msgstr "Ingen element ble lagt til utvalg etter søk etter ''{0}''"
+msgstr "Ingenting lagt til utvalg ved søk etter «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "Ingenting fjernet fra utval ved søk etter ''{0}''"
+msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
@@ -2116,5 +2170,5 @@
 "{2}"
 msgstr ""
-"Regex \"{0}\" genererte feimelding ved {1}, full error:\n"
+"Regulært uttrykk «{0}» har en feil ved posisjon {1}, feilmelding:\n"
 "\n"
 "{2}"
@@ -2123,14 +2177,15 @@
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
+"Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
+msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493
 #, java-format
 msgid "Unexpected token: {0}"
-msgstr ""
+msgstr "Uventet symbol: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514
@@ -2148,5 +2203,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592
 msgid "Wrong number of parameters for nodes operator."
-msgstr ""
+msgstr "Feil antall parametere for nodes-operator."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
@@ -2156,9 +2211,11 @@
 "nodes or range, for example nodes:10-20"
 msgstr ""
+"Ugyldig verdi for nodes-operator: {0}. Verdien må være antall noder eller "
+"intervall, for eksempel nodes:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
-msgstr ""
+msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
@@ -2169,9 +2226,9 @@
 #, java-format
 msgid "Contact {0}..."
-msgstr "Koble til {0}..."
+msgstr "Koble til {0} …"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
 msgid "Downloading..."
-msgstr "Laster ned..."
+msgstr "Laster ned …"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
@@ -2179,5 +2236,5 @@
 #, java-format
 msgid "Could not read from URL: \"{0}\""
-msgstr "Kunne ikke lese fra URL: \"{0}\""
+msgstr "Klarte ikke lese fra URL: «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62
@@ -2185,41 +2242,33 @@
 #, java-format
 msgid "Parsing error in URL: \"{0}\""
-msgstr "Feil ved sending til URL: \"{0}\""
+msgstr "Feil i URL: «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
 msgid "Error while communicating with server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Legg til"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Endre"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+msgstr "Feil ved tjenerkommunikasjon."
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Slett {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Endre {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
-msgstr "Fjern \"{0}\" i {1} ''{2}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+msgstr "Fjern «{0}» i {1} «{2}»"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
-msgstr "Sett {0}={1} i {2} ''{3}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+msgstr "Sett {0}={1} i {2} «{3}»"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2227,47 +2276,54 @@
 msgid_plural "objects"
 msgstr[0] "objekt"
-msgstr[1] "Objekter"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+msgstr[1] "objekter"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
-msgstr "Fjern \"{0}\" i {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+msgstr "Fjern «{0}» i {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Sett {0}={1} i {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr "EndreRelasjonsmedlemsrolle"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
+msgstr "Løs koordinatkonflikter i {0}"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+msgstr "kan ikke løse uavgjort konflikt"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Slett {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Slett {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Relasjonen har konflikter"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2275,14 +2331,14 @@
 "Delete from relation?"
 msgstr ""
-"Utvalg \"{0}\" er brukr i relasjon \"{1}\" med rolle {2}.\n"
-"Slett fra relasjon?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+"Utvalg «{0}» brukes av relasjon «{1}» med rolle {2}.\n"
+"Vil du slette utvalget fra relasjonen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2290,13 +2346,13 @@
 "Delete from relation?"
 msgstr ""
-"Utvalg \"{0}\" er brukt u relasjon \"{1}\".\n"
-"Slett fra relasjon?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+"Utvalg «{0}» brukes av relasjon «{1}».\n"
+"Vil du slette utvalget fra relasjonen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Splitt linje i segment"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2304,38 +2360,38 @@
 "use them.<br>Do you really want to delete?"
 msgstr ""
-"Du er i ferd med å slette Noder utenfor nedlastet område.<br>Dette kan skape "
-"problem fordi de kan være i bruk av andre objekt (som du ikke kan se nå) ."
-"<br>Er du sikker på at du vil slette?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+"Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan skape "
+"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se "
+"nå) .<br>Er du sikker på at du vil slette nodene?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+msgstr "Løs slettekonflikt i {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Flytt"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
 msgid_plural "nodes"
 msgstr[0] "node"
-msgstr[1] "Node"
+msgstr[1] "noder"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 msgid "Purging 1 primitive"
-msgstr ""
+msgstr "Rydder ut 1 objekt"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
 #, java-format
 msgid "removing reference from way {0}"
-msgstr ""
+msgstr "fjerner henvisning fra vei {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
@@ -2345,50 +2401,59 @@
 "{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:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "Fjernede Element fra Relasjoner"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "Fjern medlem i relasjon"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Roter"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Slett {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sekvens"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+msgstr "Løs {0} egenskapskonflikter i {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:41
+msgstr "Gjenopprett {0} objekter"
+
+#: ../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:52
+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 ""
+msgstr "Løs nodekonflikter i vei {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
+#, fuzzy
+msgid "Main.ds doesn't include node {0}"
+msgstr "Lokalt datasett inneholder ikke en egenskap med nøkkel {0}"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
 msgid "Apply?"
-msgstr "Gjennomfør?"
+msgstr "Gjennomføre?"
 
 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142
@@ -2397,5 +2462,5 @@
 "its nodes are suggested in order to maintain data consistency."
 msgstr ""
-"Når du snur rening på linje blir følgende egenskaper endret for å "
+"Når du snur reningen på denne linjen blir følgende egenskaper endret for å "
 "opprettholde dataintegritet."
 
@@ -2406,5 +2471,5 @@
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
 msgid "Old role"
-msgstr "Eks rolle"
+msgstr "Tidligere rolle"
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
@@ -2414,9 +2479,9 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
 msgid "Old key"
-msgstr "Eks nøkkel"
+msgstr "Tidligere nøkkel"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
 msgid "Old value"
-msgstr "Eks verdi"
+msgstr "Tidligere verdi"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
@@ -2446,5 +2511,5 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
 msgid "Roles in relations referring to"
-msgstr "Roller i relasjon viser til"
+msgstr "Roller i relasjoner som viser til"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
@@ -2455,51 +2520,77 @@
 #, java-format
 msgid "Malformed config file at lines {0}"
-msgstr "Config file har feil i linje {0}"
+msgstr "Innstillingsfil har feil i linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
 #, java-format
 msgid "Cannot open preferences directory: {0}"
-msgstr "Kan ikke åpne oppsett: {0}"
+msgstr "Kan ikke åpne innstillingsmappe: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
 #, java-format
 msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Feil i oppsett fila. Backup lagres i {0}."
+msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
 #, java-format
 msgid "Preferences stored on {0}"
-msgstr "Oppsett lagret i {0}"
+msgstr "Innstillinger lagret i {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
-msgstr "Kunne ikke laste opp oppsett. Årsak: {0}"
+msgstr "Kunne ikke laste opp innstillinger. Årsak: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
 msgid "Could not load preferences from server."
-msgstr "Kan ikke lese oppsett fra server."
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+msgstr "Klarte ikke lese innstillinger fra tjener."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "parameter «{0}» må ha en verdi"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "Desimalgrader"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
-msgstr "Grader Minutt Sekunder"
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "Ø"
@@ -2508,7 +2599,7 @@
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+msgstr "parameter {0} > 0 nødvendig. Leste {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2528,10 +2619,10 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 msgid "nodes"
-msgstr ""
+msgstr "noder"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2542,5 +2633,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 msgid "ways"
-msgstr ""
+msgstr "linjer"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2551,28 +2642,28 @@
 msgid "relation"
 msgid_plural "relations"
-msgstr[0] "Relasjon"
-msgstr[1] "Relasjoner"
+msgstr[0] "relasjon"
+msgstr[1] "relasjoner"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
 msgid "relations"
-msgstr ""
+msgstr "relasjoner"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "changeset"
-msgstr ""
+msgstr "endringssett"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "changesets"
-msgstr ""
+msgstr "endringssett"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-msgstr ""
+msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-msgstr ""
+msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118
@@ -2581,9 +2672,9 @@
 msgid_plural "{0} members"
 msgstr[0] "{0} medlem"
-msgstr[1] "{0} Medlemmer"
+msgstr[1] "{0} medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136
 msgid "highway"
-msgstr "riksvei"
+msgstr "ferdselsvei"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137
@@ -2605,61 +2696,46 @@
 msgid "{0} node"
 msgid_plural "{0} nodes"
-msgstr[0] "{0} Node"
-msgstr[1] "{0} Noder"
+msgstr[0] "{0} node"
+msgstr[1] "{0} noder"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153
 msgid "There's no primitive with version {0} in this history"
-msgstr ""
+msgstr "Denne historikken har ikke noe element med versjon {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162
 msgid "There's no version valid at date ''{0}'' in this history"
-msgstr ""
+msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173
 #, java-format
 msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-msgstr ""
+msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
 msgid "no earliest version found. History is empty."
-msgstr ""
+msgstr "Fant ingen første versjon. Historikken er tom."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
 msgid "no latest version found. History is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+msgstr "Fant ingen siste versjon. Historikken er tom."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+msgstr "Fant ikke noe objekt med ID {0} i dette datasettet"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+msgstr "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
 msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+msgstr "parameter «{0}» > 0 forventet – leste «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-msgstr ""
+msgstr "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
@@ -2667,129 +2743,129 @@
 #, java-format
 msgid "parameter {0} not in range 0..{1}, got {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Linje for areal er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
-msgstr "multipolygon linje ''{0}'' er ikke lukket."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+msgstr "multipolygon-linje «{0}» er ikke lukket."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
-msgstr "Tomt element in Relasjon."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+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:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
-msgstr "Slettet medlem ''{0}'' i relasjon."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+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:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
-msgstr "Linje ''{0}'' med færre enn to punkt."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+msgstr "Linje «{0}» med færre enn to punkter."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
-msgstr "Funnet mere enn en linje med \"from\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+msgstr "Fant mer enn én linje med «from»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
-msgstr "Funnet mere enn en linje med \"to\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+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
 msgid "More than one \"via\" found."
-msgstr "Funnet mere enn en  \"via\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+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
 #, java-format
 msgid "Unknown role ''{0}''."
-msgstr "Ukjent rolle ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+msgstr "Ukjent rolle «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
-msgstr "Ukjent medlemstype for ''{0}''."
+msgstr "Ukjent medlemstype for «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgid "No \"from\" way found."
+msgstr "Fant ingen linje med «from»."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
-msgid "No \"from\" way found."
-msgstr "Ikke funnet linje med \"from\"."
+msgid "No \"to\" way found."
+msgstr "Fant ingen linje med «to»."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-msgid "No \"to\" way found."
-msgstr "Ikke funnet linje med \"to\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
-msgstr "Ikke funnet linje eller Node med \"via\"."
+msgstr "Fant ingen node eller linje med «via»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr "Linje med \"from\" har ikke start eller slutt i \"via\" Node ."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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 ."
+msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr "Linje med \"from\" har ikke start eller slutt i \"via\" linje."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
-msgstr "linje med \"to\" har ikke start eller slutt i \"via\" linje."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
-msgstr "Fant ikke style for restriksjon {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+msgstr "Fant ikke stil for restriksjon {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr "Ingen fornuftig Rolle ''{0}'' for linje ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
-msgstr "I multipolygon er ''{0}'' ikke linje."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+msgstr "Multipolygon-medlem «{0}» er ikke en linje."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
-msgstr "Ingen ytre (outer) linje for multipolygon ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+msgstr "Ingen ytre linje for multipolygon «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Skjæring mellom linjene ''{0}'' og ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+msgstr "Skjæring mellom linjene «{0}» og «{1}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
-msgstr "Indre linje (inner) ''{0}'' er utenfor."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+msgstr "Indre linje «{0}» er utenfor."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr "Style for indre linje ''{0}'' er samme som multipolygon."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+msgstr "Stil for indre linje «{0}» er samme som multipolygon."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
-msgstr "Style for ytre linje (outer) ''{0}'' passer ikke."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+msgstr "Stil for ytre linje «{0}» passer ikke."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "Uten egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "tekst"
@@ -2797,5 +2873,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2804,4 +2880,7 @@
 "Keeping my primitive. "
 msgstr ""
+"Lokalt element med ID {0} og versjon {1} er synlig selv om tjenerens element "
+"med lavere versjon {2} ikke er synlig. Kan ikke håndtere denne "
+"selvmotsigelsen. Beholder lokalt element. "
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -2823,6 +2902,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "bakgrunn"
@@ -2832,24 +2911,9 @@
 msgstr "fremhevet"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326 (lengde- og breddegrad)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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."
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
 msgstr ""
-"Kartprojeksjonen \"{0}\" er bare laget for\n"
-"nordlige grader mellom 46.1° og57° .\n"
-"Velg annen kartprojeksjon når du ikke bruker\n"
-"en fransk WMS server.\n"
-"Ikke last opp data etter denne beskjeden."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2859,42 +2923,30 @@
 "and start a new layer on the new zone."
 msgstr ""
-"VIKTIG : data ligger langt unna\n"
-"grensene for den aktive Lambert sone.\n"
+"VIKTIG: data ligger langt unna\n"
+"grensene for den aktive Lambert-sonen.\n"
 "Ikke last opp data etter denne beskjeden.\n"
-"Angre siste aksjon, lagre arbeidet\n"
-"og start et nytt Lag i en annen sone."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+"Angre siste handling, lagre arbeidet\n"
+"og start et nytt lag i en annen sone."
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
-msgstr "Lambert Zone (Frankrike)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+msgstr "Lambert-sone (Frankrike)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
-msgstr "Lambert Zone (Estland)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+msgstr "Lambert-sone (Estland)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Kartprojeksjonen \"{0}\" er bare beregnet på\n"
-"breddegrader mellom 45.7° og 47.9°\n"
-"og lengdegrader mellom 5.7° og 10.6°.\n"
-"Benytt en annen kartprojeksjon når du jobber\n"
-"andre steder enn Sveits eller  Lichtenstein.\n"
-"Ikke last opp data etter  denne meldingen."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Sveits)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Flytt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2906,14 +2958,14 @@
 msgstr "Kan ikke lagre bokmerke."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
-msgstr "Dagens nyheter er ikke tilgjengelig"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+msgstr "Dagens melding er ikke tilgjengelig"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
-msgstr "- aktive Versjon er {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+msgstr "- aktive versjon er {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Laster ned \"Dagens melding\""
@@ -2922,9 +2974,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
 msgid "Upload Preferences"
-msgstr "Last opp oppsett"
+msgstr "Last opp innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
 msgid "Upload the current preferences to the server"
-msgstr "Last opp aktivt oppsett til server"
+msgstr "Last opp aktive innstillinger til tjener"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
@@ -2944,5 +2996,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "Endre vinduets størrelse til oppgitt geometri  (format: WIDTHxHEIGHT)"
+msgstr "Endre vinduets størrelse til oppgitt geometri  (format: BREDDExHØYDE)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
@@ -2957,6 +3009,6 @@
 "filename"
 msgstr ""
-"Last ned alle. Kan være x1,y1,x2,y2 en URL som inneholder lat=y&lon=x&zoom=z "
-"eller filnavn"
+"Last ned alle. Kan være x1,y1,x2,y2, en URL som inneholder "
+"lat=y&lon=x&zoom=z, eller filnavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
@@ -2965,6 +3017,6 @@
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
-"Last ned alle som rå GPS filer. Kan være x1,y1,x2,y2 en URL som inneholder "
-"lat=y&lon=x&zoom=z eller filnavn"
+"Last ned alle som rå GPS-filer. Kan være x1,y1,x2,y2. en URL som inneholder "
+"lat=y&lon=x&zoom=z, eller filnavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
@@ -2982,5 +3034,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid "If specified, reset the configuration instead of reading it."
-msgstr "Hvis gitt, reset konfigurasjon i stedet for å lese den inn."
+msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
@@ -3005,5 +3057,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
-msgstr "Innstillinger"
+msgstr "innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
@@ -3013,5 +3065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
-msgstr "Standard verdi for unix geometri"
+msgstr "Standard Unix-geometri"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
@@ -3037,9 +3089,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
-msgstr "Start med full skjerm"
+msgstr "Start maksimert"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
-msgstr "Sett oppsett til standard"
+msgstr "Gå tilbake til standardinnstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
@@ -3057,5 +3109,5 @@
 msgstr ""
 "Parametre leses i gitt rekkefølge, så last inn data før\n"
-"du prøver --utvalg"
+"du prøver --selection"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
@@ -3106,5 +3158,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3160,11 +3211,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104
 msgid "Zoom in"
-msgstr "Zoom inn"
+msgstr "Forstørr"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109
 msgid "Zoom out"
-msgstr "Zoom ut"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+msgstr "Forminsk"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "målestokk"
@@ -3172,5 +3223,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
 msgid "The geographic longitude at the mouse pointer."
-msgstr "Nordlige (eller sør) grader ved musepeker."
+msgstr "Lengdegrad ved musepekeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
@@ -3180,38 +3231,43 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The geographic latitude at the mouse pointer."
-msgstr "Østlige (eller vest) grader ved musepeker."
+msgstr "Breddegrad ved musepekeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The angle between the previous and the current way segment."
-msgstr "Vinkelendring fram til aktuelt linje segment"
+msgstr "Vinkel mellom forrige og nåværende linjesegment."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The (compass) heading of the line segment being drawn."
-msgstr "Kompassretning på segment som tegnes."
+msgstr "Kompassretning på segmentet som tegnes."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The length of the new way segment being drawn."
-msgstr "Lengden på segment som tegnes."
+msgstr "Lengden på segmentet som tegnes."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166
 msgid "(no object)"
-msgstr "(inget objekt)"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+msgstr "(intet objekt)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
-msgstr "Layer er ikke i lista."
+msgstr "Laget er ikke i lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
 msgid "Contacting the OSM server..."
-msgstr "Kontacter OSM server..."
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+msgstr "Kontakter OSM-tjeneren …"
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
-msgstr "Feil ved oversendelse"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+msgstr "Feil ved tolking"
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
-msgstr "Fil ikke funnet"
+msgstr "Fant ikke fila"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3231,5 +3287,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
 msgid "unset: do not set this property on the selected objects"
-msgstr "unset: ikke sett egenskap på vallgt objekt"
+msgstr "unset: ikke sett egenskap på valgte objekter"
 
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
@@ -3242,5 +3298,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
 msgid "My with Their"
-msgstr ""
+msgstr "Lokal med tjeners"
 
 #. *
@@ -3249,5 +3305,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
 msgid "My with Merged"
-msgstr ""
+msgstr "Lokal med sammenslått"
 
 #. *
@@ -3256,18 +3312,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
 msgid "Their with Merged"
-msgstr ""
+msgstr "Tjeners med sammenslått"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
-msgstr ""
+msgstr "rolle {0} deltar ikke i sammenlikningspar {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
 msgid "Properties"
-msgstr ""
+msgstr "Egenskaper"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3277,10 +3334,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
-msgstr ""
+msgstr "Noder"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Medlemmer"
@@ -3288,19 +3348,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
 msgid "No pending tag conflicts to be resolved"
-msgstr ""
+msgstr "Ingen gjenværende egenskapskonflikter å løse"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
 #, java-format
 msgid "Tags({0} conflicts)"
-msgstr ""
+msgstr "Egenskaper ({0} konflikter)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
+msgstr "{0} gjenværende egenskapskonflikter å løse"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
 msgid "Nodes(resolved)"
-msgstr ""
+msgstr "Noder (løst)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
@@ -3308,16 +3368,18 @@
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
+"Liste over sammenslåtte noder er låst. Ingen gjenværende konflikter i denne "
+"linjas nodeliste."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
 msgid "Nodes(with conflicts)"
-msgstr ""
+msgstr "Noder (med konflikter)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
 msgid "Pending conflicts in the node list of this way"
-msgstr ""
+msgstr "Gjenværende konflikter i denne veiens nodeliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
 msgid "Members(resolved)"
-msgstr ""
+msgstr "Medlemmer (løst)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
@@ -3326,28 +3388,30 @@
 "relation"
 msgstr ""
+"Liste over sammenslåtte medlemmer er låst. Ingen gjenværende konflikter i "
+"denne relasjonens medlemsliste."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
 msgid "Members(with conflicts)"
-msgstr ""
+msgstr "Medlemmer (med konflikter)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
 msgid "Pending conflicts in the member list of this relation"
-msgstr ""
+msgstr "Gjenværende konflikter i denne relasjonens medlemsliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
 msgid "No pending property conflicts"
-msgstr ""
+msgstr "Ingen gjenværende egenskapskonflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
 msgid "Properties(with conflicts)"
-msgstr ""
+msgstr "Egenskaper (med konflikter)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
 msgid "Pending property conflicts to be resolved"
-msgstr ""
+msgstr "Gjenværende egenskapskonflikter å løse"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
 msgid "Conflict Resolution"
-msgstr ""
+msgstr "Konfliktløsning"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
@@ -3355,5 +3419,5 @@
 #, java-format
 msgid "parameter current out of range: got {0}"
-msgstr ""
+msgstr "parameter «current» utenfor rekkevidde: leste {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
@@ -3361,32 +3425,32 @@
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
-msgstr ""
+msgstr "Liste i rolle {0} er for øyeblikket ikke med i et sammenlikningspar."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
-msgstr ""
+msgstr "Uventet verdi for parameter «index». Leste {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
-msgstr ""
+msgstr "fant ikke {0} i liste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
 msgid "lock scrolling"
-msgstr ""
+msgstr "synkron rulling"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
 msgid "Compare "
-msgstr ""
+msgstr "Sammenlikn "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
 msgid "My version"
-msgstr ""
+msgstr "Lokal versjon"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Liste over elementer i det lokale datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
@@ -3394,5 +3458,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
 msgid "Merged version"
-msgstr ""
+msgstr "Sammenslått versjon"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
@@ -3401,29 +3465,35 @@
 "decisions are applied."
 msgstr ""
+"Liste over sammenslåtte elementer. De vil erstatte lokale elementer når "
+"sammenslåingsvalgene tas i bruk."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
 msgid "Their version"
-msgstr ""
+msgstr "Tjenerversjon"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Liste over elementer i tjenerens datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
 msgid "> top"
-msgstr ""
+msgstr "> topp"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
+"Kopier valgte lokale elementer til starten av lista over sammenslåtte "
+"elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
 msgid "> bottom"
-msgstr ""
+msgstr "> bunn"
 
 #: ../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 ""
+"Kopier valgte lokale elementer til slutten av lista over sammenslåtte "
+"elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
@@ -3432,4 +3502,6 @@
 "merged elements"
 msgstr ""
+"Kopier valgte lokale elementer til plassen før første valgte element i lista "
+"over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
@@ -3438,12 +3510,18 @@
 "merged elements"
 msgstr ""
+"Kopier valgte lokale elementer til plassen etter første valgte element i "
+"lista over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
+"Kopier valgte elementer på tjeneren til starten av lista over sammenslåtte "
+"elementer"
 
 #: ../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 ""
+"Kopier valgte elementer på tjeneren til slutten av lista over sammenslåtte "
+"elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
@@ -3452,4 +3530,6 @@
 "of merged elements"
 msgstr ""
+"Kopier valgte elementer på tjeneren til plassen før første valgte element i "
+"lista over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
@@ -3458,25 +3538,27 @@
 "merged elements"
 msgstr ""
+"Kopier valgte elementer på tjeneren til plassen etter første valgte element "
+"i lista over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
 msgid "Up"
-msgstr ""
+msgstr "Opp"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
 msgid "Move up the selected elements by one position"
-msgstr ""
+msgstr "Flytt valgte elementer opp én plass"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
 msgid "Down"
-msgstr ""
+msgstr "Ned"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
 msgid "Move down the selected entries by one position"
-msgstr ""
+msgstr "Flytt valgte elementer ned én plass"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3485,23 +3567,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
-msgstr ""
+msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
 msgid "Freeze"
-msgstr ""
+msgstr "Lås"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
-msgstr ""
+msgstr "Lås gjeldende liste over sammenslåtte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
 msgid "Unfreeze"
-msgstr ""
+msgstr "Lås opp"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
-msgstr ""
+msgstr "Lås opp lista over sammenslåtte elementer og begynn sammenslåing"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
@@ -3510,4 +3592,6 @@
 "<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
 msgstr ""
+"<html>Trykk <strong>{0}</strong> for å begynne sammenslåingen av lokal- og "
+"tjeneroppføringer</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
@@ -3517,4 +3601,6 @@
 "html>"
 msgstr ""
+"<html>Trykk <strong>{0}</strong> for å avslutte sammenslåingen av lokal- og "
+"tjeneroppføringer</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
@@ -3522,6 +3608,6 @@
 msgid "My version ({0} entry)"
 msgid_plural "My version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lokal versjon ({0} oppføring)"
+msgstr[1] "Lokal versjon ({0} oppføringer)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
@@ -3529,6 +3615,6 @@
 msgid "Merged version ({0} entry)"
 msgid_plural "Merged version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sammenslått versjon ({0} oppføring)"
+msgstr[1] "Sammenslått versjon ({0} oppføringer)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
@@ -3536,6 +3622,6 @@
 msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tjenerens versjon ({0} oppføring)"
+msgstr[1] "Tjenerens versjon ({0} oppføringer)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
@@ -3556,9 +3642,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
-msgstr ""
+msgstr "parameter «{0}» må ha en verdi"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3566,17 +3656,20 @@
 "adjustment"
 msgstr ""
+"Justering {0} er ikke registrert ennå. Kan ikke sette deltakelse i "
+"synkronisert justering."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
-msgstr ""
+msgstr "Justering {0} er ikke regitrert ennå."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
 msgid "Node"
-msgstr ""
+msgstr "Node"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
-msgstr ""
+msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #. should not happen
@@ -3584,5 +3677,5 @@
 #, java-format
 msgid "unexpected column index. Got {0}"
-msgstr ""
+msgstr "Uventet kolonneindeks: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
@@ -3592,19 +3685,20 @@
 "html>"
 msgstr ""
+"<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: {0}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Tilkobling mislykkes"
+msgstr "Kommunikasjon med tjener feilet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505
 msgid "Yes, undelete them too"
-msgstr ""
+msgstr "Ja, gjenopprett også dem"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
 msgid "No, cancel operation"
-msgstr ""
+msgstr "Nei, avbryt operasjonen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
@@ -3614,8 +3708,10 @@
 "the server.<br><br>Do you want to undelete these nodes too?</html>"
 msgstr ""
+"<html>Ytterligere {0} noder i bruk av linje {1},<br>er slettet på tjeneren."
+"<br><br>Vil du gjenopprette også disse nodene?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
 msgid "Undelete additional nodes?"
-msgstr ""
+msgstr "Gjenopprette ytterligere noder?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
@@ -3626,12 +3722,14 @@
 "</html>"
 msgstr ""
+"<html>Ytterligere {0} objekter med henvisninger i relasjon {1},<br>er "
+"slettet på tjeneren.<br><br>Vil du gjenopprette også dem?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
 msgid "Undelete dependent primitives?"
-msgstr ""
+msgstr "Gjenopprette avhengige objekter?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
 msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Egenskaper i det lokate datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
@@ -3640,20 +3738,22 @@
 "elements when merge decisions are applied."
 msgstr ""
+"Egenskaper i det sammenslåtte elementet. De vil erstatte egenskaper i lokale "
+"elementer når sammenslåingsvalgene tas i bruk."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
 msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Egenskaper i tjenerens datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
 msgid "Coordinates:"
-msgstr ""
+msgstr "Koordinater:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
 msgid "Deleted State:"
-msgstr ""
+msgstr "Slettestatus:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
 msgid "Visible State:"
-msgstr ""
+msgstr "Synlighetsstatus:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
@@ -3671,60 +3771,58 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
 msgid "not deleted"
-msgstr ""
+msgstr "ikke slettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
 msgid "visible (on the server)"
-msgstr ""
+msgstr "synlig (på tjeneren)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
 msgid "not visible (on the server)"
-msgstr ""
+msgstr "ikke synlig (på tjeneren)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Tast inn et navn for stedet."
+msgstr "Behold en klone av den lokale versjonen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
 msgid "Physically delete from local dataset"
-msgstr ""
+msgstr "Slett fra det lokale datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
 msgid "Keep my coordiates"
-msgstr ""
+msgstr "Behold lokale koordinater"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
 msgid "Keep their coordiates"
-msgstr ""
+msgstr "Behold tjenerens koordinater"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
 msgid "Undecide conflict between different coordinates"
-msgstr ""
+msgstr "Fjern avgjørelse fra koordinatkonflikt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
 msgid "Keep my deleted state"
-msgstr ""
+msgstr "Behold lokal slettestatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
 msgid "Keep their deleted state"
-msgstr ""
+msgstr "Behold tjenerens slettestatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
 msgid "Undecide conflict between deleted state"
-msgstr ""
+msgstr "Fjern avgjørelse fra slettekonflikt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
 msgid "Keep my visible state"
-msgstr ""
+msgstr "Behold lokal synlighetsstatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
 msgid "Yes, reset the id"
-msgstr ""
+msgstr "Ja, nullstill ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Ingen dato"
+msgstr "Nei, avbryt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3735,16 +3833,19 @@
 "agree?</html>"
 msgstr ""
+"<html>For å beholde den lokale versjonen,<br>må JOSM sette ID for {0} {1} "
+"til 0.<br>Tjeneren gir elementet en ny ID neste<br>gang du laster det opp."
+"<br>Er dette OK?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Nullstill ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
-msgstr ""
+msgstr "Behold tjenerens synlighetsstatus"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
-msgstr ""
+msgstr "Ja, rydd ut objektet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
@@ -3754,28 +3855,31 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
+"<html>JOSM må fjerne lokalt element med ID {0} fra datasettet.<br>Er dette "
+"OK?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "fjern fra utvalg"
+msgstr "Fjern fra datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
 msgid "Undecide conflict between visible state"
-msgstr ""
+msgstr "Fjern avgjørelse fra visningskonflikt"
 
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rolle"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
-msgstr ""
+msgstr "Objekt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
 msgid "merged nodes not frozen yet. Can't build resolution command"
-msgstr ""
+msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
@@ -3787,6 +3891,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
-msgstr ""
+msgstr "<ikke angitt>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
@@ -3796,5 +3902,5 @@
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr ""
+msgstr "Sammeslått datasett vil ikke inneholde en egenskap med nøkkel {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
@@ -3802,5 +3908,5 @@
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Lokalt datasett inneholder ikke en egenskap med nøkkel {0}"
 
 #. setting up the properties table
@@ -3808,8 +3914,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3820,7 +3926,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3831,5 +3938,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
 msgid "cannot apply undecided tag merge item"
-msgstr ""
+msgstr "Kan ikke bruke uavgjort sammenslåing for egenskap"
 
 #. should not happen, but just in case
@@ -3837,34 +3944,34 @@
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
-msgstr ""
+msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
 msgid "My version (local dataset)"
-msgstr ""
+msgstr "Lokalt datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
-msgstr ""
+msgstr "Tjenerens datasett"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
-msgstr ""
+msgstr "Behold valgte nøkkel–verdi-par fra det lokale datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
-msgstr ""
+msgstr "Behold valgte nøkkel–verdi-par fra tjenerens datasettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
 msgid "Undecide"
-msgstr ""
+msgstr "Fjern avgjørelse"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
-msgstr ""
+msgstr "Fjerner avgjørelse fra valgte egenskaper"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
@@ -3872,9 +3979,9 @@
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Tjenerens datasett inneholder ingen egenskap med nøkkel {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Kommandoliste"
@@ -3885,6 +3992,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3895,5 +4002,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3902,10 +4009,27 @@
 msgstr "Slå av/på: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Kommandoliste: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Konflikter ved sammenføyning."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Løs"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Åpne en dialog for å sammenføye element i lista ovenfor."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3914,49 +4038,27 @@
 msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Løs"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Åpne en dialog for å sammenføye element i lista ovenfor."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Konflikter ved sammenføyning."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konflikter: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
-msgstr ""
+msgstr "Løs konflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
 msgid "Cancel conflict resolution and close the dialog"
-msgstr ""
+msgstr "Avbryt konfliktløsning og lukk vinduet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
 msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
+msgstr "Ta i bruk løste konflikter og lukk vinduet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
 msgid "Apply Resolution"
-msgstr ""
+msgstr "Bruk løsninger"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
 msgid "Apply partial resolutions"
-msgstr ""
+msgstr "Bruk ufullstendige løsninger"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
 msgid "Continue resolving"
-msgstr ""
+msgstr "Fortsett å løse"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
@@ -3968,45 +4070,54 @@
 "resolving conflicts.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Oppfrisk liste - Klikk Reload"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+"<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/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historikk"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Vis historikk på alle valgte objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Dato"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+"<html>Klarte ikke laste historikk fra tjeneren. Detaljer:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "Indeks er utenfor rekkevidde: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr "Historikkobjekt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "Last historikk"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr "Laster historikk for {0} med ID {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Les inn og oppfrisk liste over alle valgte objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Tilbakestill"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Tilbakestill status på alle valgte objekt til versjon som valgt i historikk."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Ikke implementert enda."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Vis"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr "Vis historikken for det valgte objektet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4139,4 +4250,18 @@
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Legg til"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4249,14 +4374,14 @@
 msgstr "Utvalg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Frigjør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klikk for at minimere/maksimere panelet"
@@ -4286,181 +4411,104 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Utfør endringer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Enkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Brukt av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "koblet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Egenskaper (tom verdi fjerner egenskap)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Flytt opp"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Flytt valgte medlem opp"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Legg til utvalgte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Tilføy alle valgte objekt som medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Fjern Utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Fjern alle valgte objekt fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Slett den valgte kilden fra lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Flytt ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Flytt valgt medlem ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Last ned medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
-msgstr "Last ned alle ufullstændige linjer og noder i relasjonen"
-
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "nei"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+msgstr "Last ned alle ufullstendige linjer og noder i relasjonen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Medlemmer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relasjons-editor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Det var konflikter ved import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
-msgstr "Feil i oversendelse av server respons."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+msgstr "Klarte ikke lese tjenerrespons."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
-msgstr "Kan ikke koble til serveren."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+msgstr "Klarte ikke koble til tjeneren."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
-msgstr ""
+msgstr "Klarte ikke kommunisere med tjener."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:67
@@ -4493,21 +4541,21 @@
 msgstr "Velg først et bokmerke"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "maks. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "maks. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4517,5 +4565,5 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Yttergrense for arbeidsområde"
@@ -4536,10 +4584,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
 msgid "Download area too large; will probably be rejected by server"
-msgstr "Området er for stort; vil sandsynligvis bli avvist av server"
+msgstr "Området er for stort; vil sandsynligvis bli avvist av tjener"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
-"Områdets størrelse ok, størrelsen vil sannsynligvis aksepteres av server"
+"Områdets størrelse OK, størrelsen vil sannsynligvis aksepteres av tjener"
 
 #. SAXException does not chain correctly
@@ -4554,5 +4602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186
 msgid "Cannot read place search results from server"
-msgstr "Kan ikke lese søkeresultat om sted fra server"
+msgstr "Klarte ikke lese søkeresultat om sted fra tjener"
 
 #. this is manually tuned so that it looks nice on a GNOME
@@ -4665,679 +4713,45 @@
 msgstr "Flis-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Bilder for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Les GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Ingen tid gitt for punkt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Kan ikke læse tid \"{0}\" for punkt {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Ingen bilder med lesbare tidsstempler funnet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Leser {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Geotaggede bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS-slutt: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "nåværende forskjell: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "tidssone-forskjell: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "bilde"
-msgstr[1] "bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} innenfor sporet."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Synkronisér klokke"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-bilder (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Datoen i filen \"{0}\" kunne ikke tolkes."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Det er ikke EXIF-tidspunkt i fila \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Bilde"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS-enhetens tidssone (forskjell fra foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synkronisér tidspunkt med GPS-enhet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Den indtastede tid kunne ikke tolkes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps-punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Tilpass linjetegning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Bruk globale indstillinger."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Velg linjetegnings-innstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Tilpass farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Velg en farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Markører fra navngitte punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Navngivne sporpunkt fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importer lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-lydfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Lyd-markører fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importer bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} spor, "
-msgstr[1] "{0} spor, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rute, "
-msgstr[1] "{0} ruter, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Navn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivelse: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Tidshorisont: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Lengde: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Konverter til datalag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "Historikk for {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "Lukk vinduet"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
 msgstr ""
-"<html>Opplasting av ubehandlede GPS-data som kortdata betraktes som "
-"skadeligt <br>Se her for å laste inn GPS spor:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Konvertert fra: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Last ned fra OSM langs dette spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Last ned alt innenfor:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} meter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Max areal per forespørsel:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
 msgstr ""
-"<html>Fenne handling krever {0} individuelle<br>download-forespørsler. "
-"Ønsker du<br>å fortsette?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
+"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i "
+"historikken."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
 msgstr ""
-"Noen waypoints med tidskode før start av track eller etter slutt av track "
-"ble utelatt eller flyttet til start."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Noen waypoints som var langt fra track til å finne fornuftig plassering ble "
-"utelatt."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "utenfor nedlastet område"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "versjon {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} består av:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} slettet.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "ikke satt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "API versjon: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Konvertér til GPX-lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "GPS spor"
-msgstr[1] "GPS spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punkt"
-msgstr[1] "punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "et GPS spor med {0} punkt"
-msgstr[1] "et GPS spor med {0} punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} består av {1} GPS spor"
-msgstr[1] "{0} består av {1} GPS spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "GPS-flagg"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "flagg"
-msgstr[1] "flagg"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} består av {1} flagg"
-msgstr[1] "{0} består av {1} flagg"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Synkroniser lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Lyd synkronisert i punkt {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Sett audio-merke ved avspilnings-start"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-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:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Ingen eksisterende lydmerker i dette lag å forskyve."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"Dru må dra og slippe avspillingsmarkøren til GPX track hvor lydfila tilhører "
-"(etter første markør)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Dru må SHIFT-dra og slippe avspillingsmarkøren til lydmerke eller til punkt "
-"i track for synkronisering."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Kan ikke sette ny audio-markør"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Der opstod en feil i forsøket på å vise URL'en for denne markøren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL var: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Feil ved visning av URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Avanserte innstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Endre innstillingerne direkte. Vær varsom!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Søk: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Nåværende verdi er standard."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Standardverdien er \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Standardverdien er i øyeblikket ukjent (indstillingen har ikke vært i brug "
-"enda)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Velg raden som skal endres"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Ny verdi for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Velg raden som skal slettes"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Gi en ny nøkkel med verdi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Vis lyd-menyen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Navnsett lyd- (og bilde- og web-)markører."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Vis live lydspor."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Opprett markører uten lyd når GPX-data leses."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Separate waypoints med gyldig tidskode."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Separate waypoints med tid estimert fra posisjon i track."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Trackpoints med navn."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Endrede tidsmarker (time stamps) i audio filer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Start på track (Blir alltid utført dersom dersom andre merker ikke er "
-"tilgjengelig)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Vis eller skjul lydmeny-punktet i hovedmenyen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Vis et bevegelig  icon som viser hvor på GPS track du er når lyde er "
-"innspilt."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Sett tekst på lydspor (og bilde og web) merker sammen med knappe ikoner."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr "Lag automatisk eget markørlag for waypoints ved åpning av GPX lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Når lyd importeres, opret markører fra..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Når lyd importeres, tilknyt den til ethvert waypoint i GPX-laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Lag automatisk lydmerker fra punkt i track (heller enn egne waypoints)med "
-"navn eller beskrivelse."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Lag audio merker på posisjon på GPS  track som stemmer med tidskoden på "
-"importert  WAV fil."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Antall sekunder for forover eller bakover hopp ved trykk på aktuell knapp"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Forover/bakover tid (sekunder)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Multiplikasjon benyttet ved fast forward"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Rask avspilling multiplikator"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Avspilling starter med dette antall sekunder før (eller etter når negativ) "
-"posisjon for lydsporet."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Tid på innledning (sekunder)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr "Forholdet mellom stemme recorder tid og sann tid"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Stemme  recorder kalibrering"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Farge"
+"Klarte ikke sette gjeldende versjon. Gjeldende versjon {0} er ikke "
+"tilgjengelig i historikken."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Node {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6047,5 +5461,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6196,40 +5611,742 @@
 msgstr "Navn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Versjon <strong>{0}</strong> lagt til <strong>{1}</strong> av <strong>"
+"{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Versjon {0} lagt til {1} av {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Versjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Bilder for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Les GPX …"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Ingen tid gitt for punkt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Ingen bilder med lesbare tidsstempler funnet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Leser {0} …"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Geotaggede bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS-slutt: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "nåværende forskjell: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "tidssone-forskjell: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "bilde"
+msgstr[1] "bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} innenfor sporet."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Synkronisér klokke"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-bilder (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Klarte ikke tolke datoen i fila «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Bilde"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS-enhetens tidssone (forskjell fra foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synkronisér tidspunkt med GPS-enhet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Den indtastede tid kunne ikke tolkes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps-punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Tilpass linjetegning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Bruk globale indstillinger."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Velg linjetegnings-innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Tilpass farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Velg en farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Markører fra navngitte punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Navngivne sporpunkt fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importer lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-lydfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Lyd-markører fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importer bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} spor, "
+msgstr[1] "{0} spor, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rute, "
+msgstr[1] "{0} ruter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Navn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Tidshorisont: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Lengde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Konverter til datalag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Opplasting av ubehandlede GPS-data som kortdata betraktes som "
+"skadeligt <br>Se her for å laste inn GPS spor:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Konvertert fra: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Last ned fra OSM langs dette spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Last ned alt innenfor:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} meter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Max areal per forespørsel:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Fenne handling krever {0} individuelle<br>download-forespørsler. "
+"Ønsker du<br>å fortsette?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Noen waypoints med tidskode før start av track eller etter slutt av track "
+"ble utelatt eller flyttet til start."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Noen waypoints som var langt fra track til å finne fornuftig plassering ble "
+"utelatt."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datalag {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "utenfor nedlastet område"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "versjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Det oppstod {0} konflikter under import."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} består av:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} slettet.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "ikke satt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "API versjon: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Konvertér til GPX-lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "GPS spor"
+msgstr[1] "GPS spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punkt"
+msgstr[1] "punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "et GPS spor med {0} punkt"
+msgstr[1] "et GPS spor med {0} punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} består av {1} GPS spor"
+msgstr[1] "{0} består av {1} GPS spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "GPS-flagg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "flagg"
+msgstr[1] "flagg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} består av {1} flagg"
+msgstr[1] "{0} består av {1} flagg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Synkroniser lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Lyd synkronisert i punkt {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Sett audio-merke ved avspilnings-start"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+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:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Ingen eksisterende lydmerker i dette lag å forskyve."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Dru må dra og slippe avspillingsmarkøren til GPX track hvor lydfila tilhører "
+"(etter første markør)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Dru må SHIFT-dra og slippe avspillingsmarkøren til lydmerke eller til punkt "
+"i track for synkronisering."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Kan ikke sette ny audio-markør"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Der opstod en feil i forsøket på å vise URL'en for denne markøren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL var: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Feil ved visning av URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Avanserte innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Endre innstillingerne direkte. Vær varsom!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Søk: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Nåværende verdi er standard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Standardverdien er «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Standardverdien er i øyeblikket ukjent (indstillingen har ikke vært i brug "
+"enda)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Velg raden som skal endres"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Ny verdi for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Velg raden som skal slettes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Gi en ny nøkkel med verdi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Vis lyd-menyen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Navnsett lyd- (og bilde- og web-)markører."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Vis live lydspor."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Opprett markører uten lyd når GPX-data leses."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Separate waypoints med gyldig tidskode."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Separate waypoints med tid estimert fra posisjon i track."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Trackpoints med navn."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Endrede tidsmarker (time stamps) i audio filer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+"Start på track (Blir alltid utført dersom dersom andre merker ikke er "
+"tilgjengelig)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Vis eller skjul lydmeny-punktet i hovedmenyen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Vis et bevegelig  icon som viser hvor på GPS track du er når lyde er "
+"innspilt."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Sett tekst på lydspor (og bilde og web) merker sammen med knappe ikoner."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr "Lag automatisk eget markørlag for waypoints ved åpning av GPX lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Når lyd importeres, opprett markører fra  …"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "Når lyd importeres, tilknyt den til ethvert waypoint i GPX-laget."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Lag automatisk lydmerker fra punkt i track (heller enn egne waypoints)med "
+"navn eller beskrivelse."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Lag audio merker på posisjon på GPS  track som stemmer med tidskoden på "
+"importert  WAV fil."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Antall sekunder for forover eller bakover hopp ved trykk på aktuell knapp"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Forover/bakover tid (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "Multiplikasjon benyttet ved fast forward"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Rask avspilling multiplikator"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Avspilling starter med dette antall sekunder før (eller etter når negativ) "
+"posisjon for lydsporet."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Tid på innledning (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr "Forholdet mellom stemme recorder tid og sann tid"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Stemme  recorder kalibrering"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
-msgstr "Tegne style {0}: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+msgstr "Tegnestil {0}: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Lag: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Velg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Velg en farge for {0}g"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
-msgstr "Sett til standardk"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+msgstr "Sett til standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Sett alt til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Farger brukt av forskellige objekt i JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Farger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6238,29 +6355,29 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Ingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Tegn linjer selv om ingen segmenter ble importert."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet  (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (rød = bra, green = dårlig (hvis noen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "En farge (kan tilpasses navngitte lag)"
@@ -6268,5 +6385,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6287,5 +6404,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6323,5 +6440,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6334,50 +6451,50 @@
 msgstr "Til fots"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspiler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
-msgstr "Hurtig optegning (ser uryddig ut)"
+msgstr "Hurtig opptegning (ser uryddig ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Bare ved enden af linjen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Tegn segment-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn omfang af nedlastede data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle noder i utvalg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i annen farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glatting på kartgrafikk (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellom GPS-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6386,9 +6503,9 @@
 "Max lengde (i meter) for å tegne linjer i lokal fil. '-1' tegner alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Max lengde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6397,10 +6514,10 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maksimal lengde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6408,10 +6525,10 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspiler på linjer mellom GPS-punkt."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6419,5 +6536,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6425,13 +6542,13 @@
 msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Minste avstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6441,9 +6558,9 @@
 "for Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Punkt og track linjer får farge etter hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6453,136 +6570,157 @@
 "GPS kan logge dette."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillater å justere fargen etter forskjellig gjennomsnitt hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Farge på punkt og track linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
-msgstr "Tegn retnings piler på linjestykker."
+msgstr "Tegn retningspiler på linjestykker."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
-msgstr "Sett nummers på alle segment i en linje"
+msgstr "Tegn nummer for linjesegmenter i hver linje."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
-msgstr "Tegn omrisset av data hentet fra serveren."
+msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Tegn virtuelle punkter i utvalget for lettere tilpasninger av linjer."
+msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en annen farge."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
-msgstr "Behold backup-filer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+msgstr "Behold sikkerhetskopier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
-msgstr "Lagre backup-filer med ~ i slutten av filnavnet."
+msgstr "Lagre sikkerhetskopier med ~ i slutten av filnavnet."
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Vis oppstartsskjerm"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Vis objekt-ID i lister"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
-msgstr "Tegn elastisk-hjelpelinje"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+msgstr "Tegn elastisk hjelpelinje"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
-msgstr "Arbeide uten ned- og opplasting (Potlatch metode)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+msgstr "Arbeide uten ned- og opplasting (Potlatch-metode)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
-msgstr "Ikke behov for å bytte modus. (potlatch metode)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
+msgstr "Ikke behov for å bytte modus. (Potlatch-metode)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Utseende og opplevelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Standard (automatisk valgt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Benytt innebygd standardverdier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Benytt innebygd standardverdier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Løypetype"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Indstil tilgængelige programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Last ned liste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
-msgstr "Indstilling på sites..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+msgstr "Sett opp nettsteder …"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+msgstr "Legg til URL for liste over programtillegg."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Velg en verdi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+msgstr "Rediger URL for liste over programtillegg."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Indstilling på programtillegg sider"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Visningsinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6592,81 +6730,81 @@
 "prorammet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Innstillinger for tilkobling"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
-msgstr "Innstillinger for forbindelse til OSM-serveren"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+msgstr "Innstillinger for forbindelse til OSM-tjeneren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Innstillinger for kart"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Innstilinger for kartprojeksjon og datafortolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Lydinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Innstillinger for avspilling av lyd og lyd markering."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Vis koordinater som"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Projeksjonsmetode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Kartprojeksjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Projeksjonsmetode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Vis koordinater som"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
-msgstr "Aktiver proxy server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+msgstr "Bruk proxy-tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Proxy Innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
-msgstr "Proxy server vert"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+msgstr "Proxy-tjenerens vert"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
-msgstr "Proxy server port"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+msgstr "Proxy-tjenerens port"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
-msgstr "Proxy server brukernavn"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+msgstr "Brukernavn for proxy-tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
-msgstr "Proxy server passord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+msgstr "Passord for proxy-tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
-msgstr "Web adressen for OSM server (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+msgstr "URL-adressen for OSM-tjeneren (REST API)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+msgstr "E-postadresse for OSM-kontoen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6675,17 +6813,17 @@
 "noen passord."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
-msgstr "Web adressen til server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+msgstr "URL-adresse til tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+msgstr "OSM-brukernavn (e-post)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM passord"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6693,4 +6831,7 @@
 "URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
+"<html>Advarsel: Passordet lagres i ren tekst i innstillingsfila."
+"<br>Passordet overføres i ren tekst til tjeneren som del av URL-adressen."
+"<br><b>Ikke bruk et verdifullt passord.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6700,77 +6841,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
-msgstr "Innstilling for snarveier"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+msgstr "Innstillinger for snarveier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Bytt tastatursnarvei manuelt."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Handling"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
-msgstr "Snarvei"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+msgstr "Hurtigtast"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Lag: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Opphavsmenn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Hjelp: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Kopier Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Velg raden du vil kopiere."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Tilføy en ny kilde til lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Slett den valgte kilden fra lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Meny for sortering av innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Benytt innebygd standardverdier"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Innstilling av Objektmaler"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Kilden (URL eller filnavn) på definisjonsfiler for Objektmaler. Se http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Legg til ny Objektmal instilling i lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Slett den valgte kilden fra lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Objektmal kilde"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Skilletegn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Verktøylinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Tilpass verktøylinje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Tilpass element i verktøylinja"
@@ -6786,5 +6958,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:164
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
-msgstr "<h1><a name=\"top\">Tastatur snarvei</a></h1>"
+msgstr "<h1><a name=\"top\">Tastatursnarveier</a></h1>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:165
@@ -6887,5 +7059,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:254
 msgid "Edit Shortcuts"
-msgstr "Rediger Snarveier"
+msgstr "Rediger snarveier"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:257
@@ -6938,10 +7110,10 @@
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Bruk Objektmal''{0}'' i gruppa ''{1}''"
+msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
 #, java-format
 msgid "Use preset ''{0}''"
-msgstr "Bruk Objektmal ''{0}''"
+msgstr "Bruk objektmal «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
@@ -7001,5 +7173,5 @@
 #, java-format
 msgid "Preset group ''{0}''"
-msgstr "Objektmal  gruppe ''{0}''"
+msgstr "Objektmalgruppe «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
@@ -7008,10 +7180,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37
 msgid "Contacting OSM Server..."
-msgstr "Kontakter OSM-serveren..."
+msgstr "Kontakter OSM-tjeneren …"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
 #, java-format
 msgid "Downloading points {0} to {1}..."
-msgstr "Henter punkt {0} til {1}..."
+msgstr "Laster ned punkt {0} til {1}..."
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
@@ -7021,5 +7193,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
 msgid "Downloading OSM data..."
-msgstr "Laster ned OSM data..."
+msgstr "Laster ned OSM-data …"
 
 #. SAXException does not chain correctly
@@ -7031,5 +7203,5 @@
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
-msgstr "Klargjør data..."
+msgstr "Klargjør data …"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
@@ -7040,6 +7212,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7050,5 +7222,5 @@
 #, java-format
 msgid "File \"{0}\" does not exist"
-msgstr ""
+msgstr "Fila «{0}» finnes ikke"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7056,5 +7228,5 @@
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Klarte ikke lese fil «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
@@ -7066,9 +7238,10 @@
 msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
 msgstr ""
+"Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
+msgstr "Tjeneren svarte med HTTP 404 for ID {0} – hopper over."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
@@ -7077,4 +7250,6 @@
 "for each primitive"
 msgstr ""
+"Tjeneren svarte med HTTP 404, prøver igjen med en forespørsel for hvert "
+"element."
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -7115,9 +7290,9 @@
 #, java-format
 msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-msgstr ""
+msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171
 msgid "This version of JOSM is incompatible with the configured server."
-msgstr "Denne versjon av JOSM kan ikke lese fra serveren."
+msgstr "Denne versjonen av JOSM kan ikke lese fra tjeneren."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
@@ -7127,5 +7302,5 @@
 "{0} to {1}."
 msgstr ""
-"Den støtter protocol versjon 0.5 og 0.6, men serveren støtter {0} til {1}."
+"Den støtter protokollversjon 0.5 og 0.6, mens tjeneren støtter {0} til {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176
@@ -7137,5 +7312,5 @@
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
-msgstr ""
+msgstr "Uventet ID-format i svar fra tjener – leste «{0}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260
@@ -7143,13 +7318,13 @@
 msgid ""
 "unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
-msgstr ""
+msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283
 msgid "Opening changeset..."
-msgstr "Åpner basen med rettinger.."
+msgstr "Åpner endringssett …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Closing changeset..."
-msgstr "Lukker basen med rettinger..."
+msgstr "Lukker endringssett …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
@@ -7159,18 +7334,18 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
 msgid "Preparing..."
-msgstr "Forbereder..."
+msgstr "Forbereder …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 msgid "Uploading..."
-msgstr "Laster opp..."
+msgstr "Laster opp …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
-msgstr ""
+msgstr "OSM-tjenerfiler bzip2-komprimert"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31
 msgid "Invalid bz2 file."
-msgstr ""
+msgstr "Ugyldig bzip2-fil"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
@@ -7197,9 +7372,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
-msgstr "Avbryter..."
+msgstr "Avbryter …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
-msgstr ""
+msgstr "OSM-tjenerfiler gzip-komprimert"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
@@ -7209,5 +7384,5 @@
 #, java-format
 msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
+msgstr "obligatorisk attributt «{0}» mangler"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
@@ -7215,4 +7390,5 @@
 msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «long» – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77
@@ -7221,4 +7397,6 @@
 "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «long» (>= 0) – leste "
+"«{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
@@ -7226,4 +7404,5 @@
 msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
@@ -7232,4 +7411,6 @@
 "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – leste "
+"«{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
@@ -7238,4 +7419,5 @@
 "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
@@ -7245,4 +7427,6 @@
 "''{1}''"
 msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «OsmPrimitiveType» – "
+"leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
@@ -7252,5 +7436,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
 msgid "OSM Server Files"
-msgstr "OSM server filer"
+msgstr "OSM-tjenerfiler"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166
@@ -7282,5 +7466,5 @@
 #, java-format
 msgid "Missing attribute \"ref\" on member in relation {0}"
-msgstr ""
+msgstr "Mangler attributt «ref» for medlem av relasjon {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
@@ -7288,14 +7472,15 @@
 msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
 msgstr ""
+"Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
 #, java-format
 msgid "Missing attribute \"type\" on member {0} in relation {1}"
-msgstr ""
+msgstr "Mangler attributt «type» for medlem {0} i relasjon {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
 #, java-format
 msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-msgstr ""
+msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
@@ -7312,14 +7497,15 @@
 "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}"
 msgstr ""
+"Ugyldig verdi for attributt «version» for OSM-element med ID {0} – leste {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 #, java-format
 msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-msgstr ""
+msgstr "Mangler attributt «version» for OSM-element med ID {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
 #, java-format
 msgid "Missing required attribute \"{0}\"."
-msgstr "Mangler obligatorisk attributt \"{0}\"."
+msgstr "Mangler obligatorisk attributt «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
@@ -7330,5 +7516,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495
 msgid "Prepare OSM data..."
-msgstr "Klargjør OSM data..."
+msgstr "Klargjør OSM-data …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
@@ -7339,18 +7525,18 @@
 #, java-format
 msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-msgstr ""
+msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72
 msgid "Downloading history..."
-msgstr ""
+msgstr "Laster ned historikk …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28
 msgid "Contacting Server..."
-msgstr "Kobler opp Server..."
+msgstr "Kobler til tjener …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58
 #, java-format
 msgid "Failed to open connection to API {0}"
-msgstr ""
+msgstr "Klarte ikke åpne tilkobling til API {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
@@ -7358,13 +7544,14 @@
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr ""
-"Kunne ikke koble til OSM server. Vennligst kontroller internett tilkoblingen "
-"din."
+"Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
+"Advarsel: Innstilling «{0}» eller API-versjon «{1}» i datasettet krever bruk "
+"av endringssett, men API kan ikke håndtere dem. Ignorerer endringssett."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
@@ -7373,15 +7560,15 @@
 msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Opdater programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Last ned Programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7394,32 +7581,32 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
 msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+msgstr[0] "{0} programtillegg lastet ned. Start JOSM på nytt."
+msgstr[1] "{0} programtillegg lastet ned. Start JOSM på nytt."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr ""
+msgstr "Laster ned programtillegg {0} …"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr "Hopp over nedlasting"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
-msgstr ""
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr "JOSM versjon {0} er nødvendig for programtillegg {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+msgstr "Last ned programtillegg"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
-msgstr ""
+msgstr "Hopp over nedlasting"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -7434,5 +7621,5 @@
 "required."
 msgstr ""
-"ADVARSEL - Programtillegget {0} skulle lastes inn, men det er ikke lenger "
+"Advarsel – programtillegget {0} skulle lastes inn, men det er ikke lenger "
 "behov for det."
 
@@ -7440,5 +7627,5 @@
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
-msgstr ""
+msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94
@@ -7468,6 +7655,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Fjern programtillegg"
@@ -7482,5 +7669,5 @@
 msgstr "Behold programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7490,16 +7677,16 @@
 "skrive over eksisterende."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr "En uventet feil opstod som kan stamme fra programtillegget \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "I følge nformasjon i tilleggsprogram, er {0} opphavsmann."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7507,9 +7694,9 @@
 "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Skal programtillegget fjernes?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7519,5 +7706,5 @@
 "lese programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7526,34 +7713,34 @@
 "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM utviklerne."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "ingen beskrivelse tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "Flere detaljer"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
 msgid_plural "Downloaded plugin information from {0} sites"
-msgstr[0] "Last ned info om programtillegg fra {0} server"
-msgstr[1] "Last ned info om programtillegg fra {0} servere"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+msgstr[0] "Lastet ned informasjon om programtillegg fra {0} tjener"
+msgstr[1] "Lastet ned informasjon om programtillegg fra {0} tjenere"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Fant ikke info om programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Alle installerte programtillegg er siste versjon."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7566,9 +7753,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Last ned programtillegg som mangler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7581,6 +7768,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7603,14 +7790,14 @@
 msgstr "ukjent"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versjon {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Programtillegg inkludert i JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7688,6 +7875,6 @@
 "\n"
 msgstr ""
-"Hurtigtasten kunne ikke settes ''{0}'' forhandlingen ''{1}'' ({2}) \n"
-"fordi  ''{3}'' ({4}) allerede benytter denne hurtigtasten.\n"
+"Klarte ikke sette hurtigtasten «{0}» for handlingen «{1}» ({2})\n"
+"fordi «{3}» ({4}) allerede benytter denne hurtigtasten.\n"
 "\n"
 
@@ -7706,5 +7893,5 @@
 "\n"
 msgstr ""
-"Bruk i stedet hurtigtasten ''{0}'' .\n"
+"Bruker i stedet hurtigtasten «{0}».\n"
 "\n"
 
@@ -7727,13 +7914,13 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr "Velg to linjer med en felles Node"
+msgstr "Velg to linjer med en felles node"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr "Velg to linjer med BARE EN felles Node"
+msgstr "Velg to linjer med kun én felles node"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
 msgid "Create a grid of ways"
-msgstr "Lag Rutenett med linjer"
+msgstr "Lag rutenett med linjer"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74
@@ -7778,5 +7965,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177
 msgid "Connecting..."
-msgstr "Kobler til..."
+msgstr "Kobler til …"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200
@@ -7794,5 +7981,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262
 msgid "Upload failed. Server returned the following message: "
-msgstr "Opplasting feilet. Server gav følgende svar: "
+msgstr "Klarte ikke laste opp. Tjeneren gav følgende svar: "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
@@ -7828,5 +8015,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr "AgPifoJ - Geotagget  foto"
+msgstr "AgPifoJ – Geotaggede  bilder"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -7874,45 +8061,45 @@
 "{0} km/t"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Leser GPS posisjoner fra EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Starter scanning av mapper"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "En av de valgte filene var null (tom)!!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Les bilder"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Klarte ikke å lage fullstendig sti til mappa  {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanner mappa {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fant tom fil i mappa {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Juster til GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7921,5 +8108,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 msgid "Open images with AgPifoJ..."
-msgstr "Åpne bilder med AgPifoJ..."
+msgstr "Åpne bilder med AgPifoJ …"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:50
@@ -7935,5 +8122,5 @@
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr "Fila {0} er lastet inn under navnet \"{1}\""
+msgstr "Fila {0} er lastet inn under navnet «{1}»"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170
@@ -8120,34 +8307,36 @@
 msgstr "Sekunder: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Koplet {0} av {1} foto til GPX spor."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Tidsforskjell på {0} dager)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Forskyvning mellom spor og foto: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
 msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+"Klarte ikke synkronisere bildene med GPX-sporet. Bruk glidebryterne for å "
+"synkronisere bildene manuelt."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Klarte ikke å koble foto til sporet"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Juster tidssone og forskyvning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Standardverdier"
@@ -8169,5 +8358,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
@@ -8206,5 +8395,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283
 msgid "Choose from..."
-msgstr "Velg fra"
+msgstr "Velg fra …"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:292
@@ -8247,12 +8436,16 @@
 "Would you like to restore F11 for grab action ?"
 msgstr ""
+"Programtillegget cadastre-fr har tidligere brukt hurtigtasten F11 for å "
+"laste ned bilder.\n"
+"Denne tasten brukes nå for å endre fullskjermmodus som forvalg.\n"
+"Vil du gjenopprette bruken av F11 til å laste ned bilder?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "Restore grab shortcut F11"
-msgstr ""
+msgstr "Gjenopprett F11-hurtigtast"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid "JOSM is stopped for the change to take effect."
-msgstr ""
+msgstr "JOSM avsluttes for at endringen skal tre i kraft."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
@@ -8335,5 +8528,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102
 msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr "Trekk et rektangel rundt data lastet ned fra  WMS server."
+msgstr "Trekk et rektangel rundt data lastet ned fra WMS-tjener."
 
 #. the downloaded images multiplier
@@ -8379,5 +8572,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
 msgid "Contacting WMS Server..."
-msgstr "Kobler opp WMS Server..."
+msgstr "Kobler til WMS-tjener …"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
@@ -8400,9 +8593,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
-msgstr "Lag SVG ViewBox..."
+msgstr "Hent ut SVG-ViewBox …"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
-msgstr "Søk etter best passende avgrensing..."
+msgstr "Hent ut beste avgrensing …"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
@@ -8494,5 +8687,5 @@
 msgid "Simplify Way (remove {0} node)"
 msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "Forenkle linje (fjern {0} Node)"
+msgstr[0] "Forenkle linje (fjern {0} node)"
 msgstr[1] "Forenkle linjer (fjern {0} noder)"
 
@@ -8504,5 +8697,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr ""
+msgstr "Juster posisjonen på WMS-laget (kun rasterbilder)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
@@ -8522,7 +8715,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
-msgstr "Blank ut lag"
+msgstr "Blankt lag"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
@@ -8566,4 +8759,5 @@
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
+"Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419
@@ -8622,37 +8816,39 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS-filer (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr "Formatfeil: "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "TangoGPS-data importert"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "Klarte ikke importere TangoGPS-data."
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Feil Fil Format"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA data er lest inn"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Feil ved import av NMEA data!"
+msgid "TCX Files (*.tcx)"
+msgstr "TangoGPS-filer (*.log)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
 msgid "Duplicate Way"
-msgstr "Dupliser linje"
+msgstr "Fordoble linje"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:76
 msgid "Duplicate selected ways."
-msgstr "Dupliser valgte linjer."
+msgstr "Fordoble valgte linjer."
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
 msgid "Can't duplicate unordered way."
-msgstr "Kan ikke duplisere ukategorisert linje."
+msgstr "Kan ikke fordoble usortert linje."
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
 msgid "You must select at least one way."
-msgstr "Du må velge minst en linje."
+msgstr "Du må velge minst én linje."
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:240
@@ -8660,7 +8856,7 @@
 msgstr "Opprett kopi av linje"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
-msgstr "Lag for redigering av GPX spor"
+msgstr "Lag for redigering av GPX-spor"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
@@ -8670,5 +8866,5 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46
 msgid "edit gpx tracks"
-msgstr "Rediger GPX spor"
+msgstr "Rediger GPX-spor"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85
@@ -8679,11 +8875,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Importer spor fra GPX lag"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Slett eksisterende sti"
@@ -8692,6 +8888,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Fant ikke GPX lag"
@@ -8754,6 +8950,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Oppdater"
@@ -8789,5 +8985,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
 msgid "Importing data from DG100..."
-msgstr "Importerer data fra DG100..."
+msgstr "Importerer data fra DG100 …"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
@@ -8926,10 +9122,10 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
 msgid "Looking for shoreline..."
-msgstr "Søker etter kystlinje..."
+msgstr "Søker etter kystlinje …"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145
 #, java-format
 msgid "{0} nodes so far..."
-msgstr "{0} noder til nå..."
+msgstr "{0} noder til nå …"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
@@ -8953,5 +9149,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
-msgstr "sjekker mellomlager..."
+msgstr "sjekker mellomlager …"
 
 #. *
@@ -8960,5 +9156,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
 msgid "Running vertex reduction..."
-msgstr "Reduserer antall punkt..."
+msgstr "Reduserer antall punkter …"
 
 #. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain.");
@@ -8968,5 +9164,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
-msgstr "Kjører Douglas-Peucker tilnærming..."
+msgstr "Kjører Douglas-Peucker-tilnærming …"
 
 #. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
@@ -8976,5 +9172,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 msgid "Removing duplicate nodes..."
-msgstr "Fjerner doble Noder"
+msgstr "Fjerner doble noder …"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
@@ -8985,5 +9181,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
 msgid "An unknown error has occurred"
-msgstr ""
+msgstr "Det oppstod en ukjent feil"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -9062,7 +9258,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "vann"
@@ -9082,9 +9278,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
 msgid "Maximum number of segments per way"
-msgstr "Max antal linjestykker pr linje"
+msgstr "Maksimalt antall segmenter per linje"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of nodes in initial trace"
-msgstr "Max antall Noder pr Vei"
+msgstr "Maksimalt antall noder i første opptegning"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
@@ -9118,5 +9314,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Tag ways as"
-msgstr "Egenskap på linje"
+msgstr "Egenskap for linjer"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
@@ -9134,10 +9330,10 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Source text"
-msgstr "Beskrivelse av Kilde"
+msgstr "Beskrivelse av kilde"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
-"Max antall linjesegment tillatt i hver genererte linje. Standard er 250."
+"Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
@@ -9207,5 +9403,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Data source text. Default is Landsat."
-msgstr "Data kilde beskrivelse. Standard: Landsat."
+msgstr "Beskrivelse av datakilde. Standard: Landsat."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
@@ -9219,5 +9415,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45
 msgid "Downloading image tile..."
-msgstr "Laster ned bildefil"
+msgstr "Laster ned bildefil …"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148
@@ -9259,5 +9455,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:52
 msgid "Way Info"
-msgstr "Linje Informasjon"
+msgstr "Linjeinformasjon"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:58
@@ -9281,5 +9477,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr "Koble til gpsd-server og vis nåværende posisjon i LiveGPS-lag"
+msgstr "Koble til gpsd-tjener og vis nåværende posisjon i LiveGPS-lag"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
@@ -9375,8 +9571,11 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>Openstreetbugs-tillegget bruker den gamle tjeneren på appspot.com."
+"<br>En ny tjener er tilgjengelig på schokokeks.org.<br>Vil du bytte til den "
+"nye tjeneren? (Anbefalt)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Bytte til ny openstreetbugs-tjener?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -9403,14 +9602,14 @@
 msgstr "Header inneholder flere verdier og kan ikke kobles til enkelt streng"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Åpne OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+msgstr "Åpner OpenStreetBugs-vinduet og starter automatisk nedlasting"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9442,6 +9641,6 @@
 "comment:</html>"
 msgstr ""
-"<html>Ja, marker dette tema som ''done''?<br><br>Du kan legge inn "
-"tilleggskommentar:</html>"
+"<html>Vil du virkelig markere denne saken som ferdig?<br><br>Du kan legge "
+"inn tilleggskommentar:</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
@@ -9468,5 +9667,5 @@
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
 msgid "Open Visible..."
-msgstr "Åpne synlige..."
+msgstr "Åpne synlige …"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
@@ -9476,5 +9675,5 @@
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57
 msgid "No view open - cannot determine boundaries!"
-msgstr "Ingen arbeidsområde åpnet - kan ikke finne avgrensing!"
+msgstr "Ingen arbeidsområde åpnet – kan ikke finne avgrensing."
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110
@@ -9544,19 +9743,19 @@
 msgstr "Tillatte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Be om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Vil du tillate dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9629,5 +9828,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
 msgid "Highway type"
-msgstr "Riksvei Type"
+msgstr "Type ferdselsvei"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
@@ -9673,5 +9872,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Flush Tile Cache"
-msgstr ""
+msgstr "Tøm bildehurtiglager"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
@@ -9680,7 +9879,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Laster opp..."
+msgstr "laster bilde …"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9703,5 +9901,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
-msgstr "Kilde for kartbilder"
+msgstr "Kilder for kartbilder"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
@@ -9756,5 +9954,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-msgstr "Dupliser hurtigtast for knappen '{0}' - knappen blir ignorert!"
+msgstr "Dupliser hurtigtast for knappen «{0}» – knappen blir ignorert."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
@@ -9767,5 +9965,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr "Surveyor..."
+msgstr "Surveyor …"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
@@ -9855,5 +10053,5 @@
 #, java-format
 msgid "unexpected column number {0}"
-msgstr ""
+msgstr "Uventet kolonnenummer {0}"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -9874,13 +10072,4 @@
 msgstr "Du må først oppgi kilde for objektmaler."
 
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importer TCX Fil..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importer TCX fil som GPS spor"
-
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
 msgid "Reverse a terrace"
@@ -9910,5 +10099,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:130
 msgid "Select a single, closed way of at least four nodes."
-msgstr "Velg en enkelt lukket linje med minst fire Noder."
+msgstr "Velg én enkel lukket linje med minst fire noder."
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:199
@@ -10007,5 +10196,5 @@
 #, java-format
 msgid "\"{0}\" is not closed and therefore can't be joined."
-msgstr "\"{0}\" er ikke lukket, og kan derfor ikke være med i sammenføyning."
+msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155
@@ -10016,7 +10205,7 @@
 "Are you really sure to continue?"
 msgstr ""
-"De valgtelinjene har Noder på utsiden av valgt dataområde.\n"
-"Dette kan medføre at Noder blir slettet ved uhell.\n"
-"Er du sikker på å fortsette?"
+"De valgte linjene har noder utenfor nedlastet dataområde.\n"
+"Dette kan medføre at noder blir slettet ved uhell.\n"
+"Er du sikker på at du vil fortsette?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158
@@ -10027,9 +10216,9 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
 msgid "Please select at least one closed way the should be joined."
-msgstr "Velg minst en lukket linje å sammenføye med."
+msgstr "Velg minst én lukket linje å sammenføye med."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
 msgid "No intersection found. Nothing was changed."
-msgstr ""
+msgstr "Fant ingen skjæring. Ingen endringer ble gjort."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
@@ -10058,6 +10247,6 @@
 "verify no errors have been introduced."
 msgstr ""
-"Noen linjer er medlem i relasjoner som er endret. Vennligst bekreft at ingen "
-"feil er lagt inn."
+"Noen linjer er medlem i relasjoner som er endret. Sjekk at ingen feil har "
+"oppstått."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -10071,5 +10260,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
 msgid "Join Areas: Remove Short Ways"
-msgstr "Slå sammen areal: Fjern Korte linjer"
+msgstr "Slå sammen arealer: fjern korte linjer"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -10079,5 +10268,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856
 msgid "Remove tags from inner ways"
-msgstr "Fjern egenskaper på linjer som er del av Relasjon (inner)"
+msgstr "Fjern egenskaper fra indre linjer"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885
@@ -10093,33 +10282,33 @@
 msgstr "Åpner dialog som lar deg gå til bestemt posisjon"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Gi inn Lat/Lon for posisjon du vil gå til"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Du kan også lime inn URL fra www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoom (i meter)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Gå dit"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Gå til posisjon"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Kunne ikke tolke Lat / Lon"
@@ -10131,9 +10320,9 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Delete unnecessary nodes from a way."
-msgstr "Slett overflødige Noder fra linje."
+msgstr "Slett overflødige noder fra en linje."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82
 msgid "Please select at least one way to simplify."
-msgstr "Velg minst en linje å forenkle."
+msgstr "Velg minst én linje å forenkle."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87
@@ -10142,6 +10331,6 @@
 msgid_plural ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr[0] "Utvalget har  {0} linje. Er du sikker du vil forenkle denne?"
-msgstr[1] "Utvalget har  {0} linjer. Er du sikker du vil forenkle disse?"
+msgstr[0] "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?"
+msgstr[1] "Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -10243,5 +10432,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
 msgid "validation other"
-msgstr "validering - annet"
+msgstr "gyldighetssjekk – annet"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
@@ -10313,5 +10502,5 @@
 #, java-format
 msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr "Erstatt \"{0}\" med \"{1}\" for"
+msgstr "Erstatt «{0}» med «{1}» for"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
@@ -10354,5 +10543,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
 msgid "Duplicated way nodes."
-msgstr "Dobbelt-linjeoder"
+msgstr "Doble linjenoder."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -10362,5 +10551,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
 msgid "Duplicated way nodes"
-msgstr "Dobbelt-linjeNoder"
+msgstr "Doble linjenoder"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
@@ -10382,6 +10571,6 @@
 "than one way."
 msgstr ""
-"Denne testen sjekker at en forbindelse mellem to punkter ikke benyttes af "
-"mer enn en linje."
+"Denne testen sjekker at en forbindelse mellom to noder ikke benyttes av mer "
+"enn én linje."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
@@ -10391,5 +10580,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
 msgid "Overlapping highways (with area)"
-msgstr "Overlappende riksveier (med område)"
+msgstr "Overlappende ferdselsveier (med område)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
@@ -10403,5 +10592,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
 msgid "Overlapping highways"
-msgstr "Overlappende riksveier"
+msgstr "Overlappende ferdselsveier"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
@@ -10421,5 +10610,5 @@
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
-msgstr "Denne testen sjekker om Noder går igjen flere ganger i en linje."
+msgstr "Denne testen sjekker om noder går igjen flere ganger i en linje."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
@@ -10433,23 +10622,23 @@
 msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Egenskapskontroll"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Denne programutvidelsen kontrollerer egenskapers nøkler og verdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr "Ugyldig egenskapskontroll-linje - {0}: {1}"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+msgstr "Ugyldig egenskapskontroll-linje – {0}: {1}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ugyldig stavekontroll linje: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10460,5 +10649,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Ulovlige kombinasjoner Egenskap / Verdi"
@@ -10466,78 +10655,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Problem med visning"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
-msgstr "Nøkkel \"{0}\" er ulovlig"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+msgstr "Nøkkel «{0}» er ugyldig."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Egenskaper uten verdier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Ulovlig egenskapsnøkkel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Ulovlig mellomrom i Nøkkel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Egenskap Verdi starter eller slutter med mellomrom"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Egenskap Verdi inneholder HTML koding"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr "Nøkkelen \"{0}\" er ikke blant Objektmalene"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+msgstr "Nøkkel «{0}» finnes ikke i objektmalene"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Objektmalene inneholder ikke Nøkkelen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Verdien \"{0}\" for nøkkelen \"{1}\" finnes ikke i Objektmaler"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+msgstr "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Objektmalen har ikke Egenskapsverdi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Sjekk egenskabsnøkler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Bekreft at egenskabsnøklene kan sjekkes mot en ordliste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Bruk avansert egenskapskontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr "Kontroller egenskapsverdiene med hjelp av avanserte regler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Egenskapskontroll-kilde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10547,81 +10736,91 @@
 "org/index.php/User:JLS/speller) eller \"tag checking data files\"."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
-msgstr "Tilføy en ny kilde til listen."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+msgstr "Tilføy en ny kilde til lista."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Rediger valgt kilde."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Datakilder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Sjekk egenskapsverdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr "Bekreft at du vil sjekke egenskapsverdiene imot Objektmalene."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Se etter FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr "Søker etterNoder eller linjer med FIXME i en egenskapsverdi"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+msgstr "Søker etter noder eller linjer med FIXME i en egenskapsverdi"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Finn notater om tegning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Sjekk etter feil ved opptegning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Bruk standard datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Bruk standard datafil (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Bruk standard datafil."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Bruk standard datafil (anbefales)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Bruk standard fil for stavekontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Brug standard fil for stavekontroll (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Korriger egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Kunne ikke finne element-typen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Kunne ikke finne advarsels-niveå"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
-msgstr "Ugyldig uttrykk ''{0}''"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+msgstr "Ugyldig uttrykk «{0}»"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
-msgstr "Ugyldig regulært uttrykk \"{0}\""
+msgstr "Ugyldig regulært uttrykk «{0}»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
 msgid "Unclosed Ways."
-msgstr "Ikke lukket linje"
+msgstr "Ikke lukkede linjer."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
@@ -10642,5 +10841,5 @@
 #, java-format
 msgid "amenities type {0}"
-msgstr "Type bekvemligheter {0}"
+msgstr "fasilitetstype {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
@@ -10759,7 +10958,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "bygning"
@@ -10773,5 +10972,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "område"
@@ -10779,27 +10978,27 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
 msgid "Unclosed way"
-msgstr "Ikke Lukket linje"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+msgstr "Ikke lukket linje"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
-msgstr "Ikke knyttede linjer"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+msgstr "Ikke knyttede linjer."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Sjekker om en linje har endepunkt nesten inntil annen  linje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
-msgstr "Sluttnode i linje nær kjørevei"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+msgstr "Sluttnode nær annen ferdselsvei"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Sluttnode nær annen linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
-msgstr "Linje Node nær annen linje"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+msgstr "Linjenode nær annen linje"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Knyttet endenode nær annen linje"
@@ -10812,37 +11011,42 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr "Sjekker for Noder uten egenskap som heller ikke tilhører noen linje"
+msgstr "Sjekker for noder uten egenskaper som heller ikke tilhører noen linje."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:56
 msgid "Untagged, empty and one node ways."
-msgstr "Linjer med en Node, tomme eller uten egenskaper."
+msgstr "Linjer med én node, tomme eller uten egenskaper."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:57
 msgid "This test checks for untagged, empty and one node ways."
-msgstr "Finner linjer med en Node, som er tomme eller er uten egenskaper."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+msgstr "Finner linjer med én node, som er tomme eller er uten egenskaper."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Linjer uten navn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Rediger kryss"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Linjer uten egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Tomme linjer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
-msgstr "Linjer med bare en Node"
+msgstr "Linjer med bare én node"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
 msgid "Wrongly Ordered Ways."
-msgstr "Linjer med feil retning"
+msgstr "Linjer med feil retning."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "This test checks the direction of water, land and coastline ways."
-msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning"
+msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
@@ -10861,5 +11065,5 @@
 #, java-format
 msgid "{0}, ..."
-msgstr "{0}, ..."
+msgstr "{0}, …"
 
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67
@@ -10868,16 +11072,16 @@
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92
 msgid "Select a starting node on the end of a way"
-msgstr ""
-
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+msgstr "Velg en startnode i enden av en linje"
+
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
-msgstr ""
+msgstr "Nådde slutten av linja"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+msgstr "Nådde et kryss"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Det oppsto en feil"
@@ -10917,4 +11121,27 @@
 "use."
 msgstr ""
+"Sie können WMS-Einträge in den WMSPlugin-Einstellungen hinzufügen, ändern "
+"und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
+"\n"
+"Sie können dies in den erweiterten Einstellungen auch manuell nach folgendem "
+"Schema erledigen:\n"
+"wmsplugin.url.1.name=LandSat\n"
+"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+"wmsplugin.url.2.name=NPE-Karten ...\n"
+"\n"
+"Die komplette LandSat-WMS-URL aus dem Beispiel ist:\n"
+"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg \n"
+"\n"
+"Für die Metacarta-Kartenkorrektur http://labs.metacarta.com/rectifier/ , "
+"muss nur die relevante ID eingegeben werden.\n"
+"Um einen Metacarta-Kartenkorrektur-Menüeintrag anzulegen, erstellen Sie "
+"manuell eine URL wie in folgendem Beispiel(und ersetzen die 73 durch Ihre "
+"Bild-ID):\n"
+"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
+"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
+"\n"
+"Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht unbedenklich "
+"sind. Im Zweifel verzichten Sie auf die Nutzung."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
@@ -10925,5 +11152,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
 msgid "Rectified Image..."
-msgstr "Ortografisk korrekt bilde"
+msgstr "Ortografisk korrekt bilde …"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
@@ -10934,5 +11161,5 @@
 #, java-format
 msgid "WMS: {0}"
-msgstr ""
+msgstr "WMS: {0}"
 
 #. This service serves the purpose of "just this once" without forcing the user
@@ -10942,5 +11169,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
 msgid "Custom WMS Link"
-msgstr ""
+msgstr "Selvvalgt WMS-adresse"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
@@ -10950,9 +11177,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
 msgid "Visit Homepage"
-msgstr ""
+msgstr "Gå til hjemmeside"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
 msgid "WMS URL or Image ID:"
-msgstr ""
+msgstr "WMS-URL eller bilde-ID:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148
@@ -10969,5 +11196,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
 msgid "No valid WMS URL or id"
-msgstr ""
+msgstr "Ingen gyldig WMS-URL eller ID"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
@@ -10975,5 +11202,5 @@
 msgstr "Tilpass posisjon på valgt  WMS lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10981,5 +11208,5 @@
 "This may lead to wrong coordinates."
 msgstr ""
-"Kartprojeksjonen ''{0}'' i URL og valgt kartprojeksjon ''{1}'' passer ikke.\n"
+"Kartprojeksjonen «{0}» i URL og valgt kartprojeksjon «{1}» passer ikke.\n"
 "Dette resulterer i feil koordinater."
 
@@ -10988,117 +11215,106 @@
 msgstr "Automatisk nedlasting"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, 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:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 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:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Last ned synlige kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../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:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgstr "Lagre WMS-lag"
+
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+msgstr "Last inn WMS-lag"
+
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Feil Fil Format"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Åpne tomt WMS lag til data fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Innstillinger WMS Programtillegg"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr "Rediger liste over WMS-tjenere som vises i WMS-programtillegg"
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr "Rediger liste over WMS servere som vises i WMS programtillegg"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Meny Navn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Meny Navn (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Gi meny navn og WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Kopier Standard"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Velg raden du vil kopiere."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr "Overlapp kartbilder"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% av bredden:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% av lengden:"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Last ned"
 
 #. *
@@ -11136,5 +11352,5 @@
 #: build/specialmessages.java:10
 msgid "Audio Device Unavailable"
-msgstr ""
+msgstr "Ingen lydenhet tilgjengelig"
 
 #. Java message loading audio data
@@ -11156,5 +11372,4 @@
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
-"Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung."
 
 #. Plugin colorscheme
@@ -11175,5 +11390,5 @@
 #: build/trans_plugins.java:9
 msgid "Create a grid of ways."
-msgstr "Lag ett rutenett med linjer."
+msgstr "Lag et rutenett med linjer."
 
 #. Plugin czechaddress
@@ -11186,5 +11401,5 @@
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Lar deg importere forskjellige dataformater direkte i JOSM."
 
 #. Plugin DirectUpload
@@ -11208,4 +11423,5 @@
 "very fast."
 msgstr ""
+"Lar deg anonymisere tidsstempler og raskt slette deler av store GPX-spor."
 
 #. Plugin globalsat
@@ -11239,5 +11455,7 @@
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
-msgstr "Gir live GPS input (bevegelig merke) gjennom kobling til gpsd server."
+msgstr ""
+"Gir GPS-informasjon i sanntid (bevegelig merke) gjennom tilkobling til gpsd-"
+"tjener."
 
 #. Plugin measurement
@@ -11248,7 +11466,7 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
-"Gir deg måleverktøy for måling av segmentlengde og segmentretning, areal "
-"omgitt av (en enkelt) lukket linje og lage målestier (som også kan "
-"importeres fra GPX lag)."
+"Gir deg måleverktøy for å måle lengde og retning på segmenter og areal "
+"omgitt av en (enkel) lukket linje, og lage målestier (som også kan "
+"importeres fra GPX-lag)."
 
 #. Plugin nearclick
@@ -11261,5 +11479,5 @@
 "Simulerer et klikk når du gjør korte og små musedrag. Dette er beregnet på "
 "tablets og trykkfølsom skjerm hvor det er problemer å klikke med musa "
-"samtidig som du drar (generelt tablet problem i java)."
+"samtidig som du drar (generelt tablet-problem i java)."
 
 #. Plugin openlayers
@@ -11335,29 +11553,24 @@
 "the jar-file as standalone as well."
 msgstr ""
-"Legger inn en tester for Objektmaler i hjelpemenyen til hjelp ved redigering "
-"av Objektmaler  (fohåndsvising av dialog). Java JAR fila kan også kjøres "
+"Legger inn en tester for objektmaler i hjelpemenyen til hjelp ved redigering "
+"av objektmaler (fohåndsvising av dialog). JAR-fila kan også kjøres "
 "selvstendig."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Last inn TCX filer direkte fra JOSM."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
 "user, opens browser showing selected author profile page."
 msgstr ""
-"Verktøy for å redigere opphavsmenn/brukere. Velger kartdata fra valgt "
-"bruker, åpner brukerprofil i internett browser."
+"Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt "
+"bruker, åpner brukerprofil i nettleser."
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11368,5 +11581,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11377,14 +11590,13 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
-msgstr ""
-"Viser koordinatfestet bilde som bakgrunn i JOSM (WMS servere, Yahoo, ...)."
+msgstr "Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)."
 
 #. <!--
@@ -11473,5 +11685,5 @@
 #: build/trans_presets.java:1526 build/trans_presets.java:2996
 msgid "Reference"
-msgstr "Vei Nr"
+msgstr "Veinummer"
 
 #. item "Streets/Motorway" text "Name"
@@ -11813,5 +12025,5 @@
 #: build/trans_presets.java:67
 msgid "Motorway Link"
-msgstr "Motorvei tilførselveg"
+msgstr "Av-/påkjørsel for motorvei"
 
 #. item
@@ -11820,5 +12032,5 @@
 #: build/trans_presets.java:70
 msgid "Edit Motorway Link"
-msgstr "Rediger Motorvei tilførselveg"
+msgstr "rediger av-/påkjørsel for motorvei"
 
 #. item "Streets/Motorway Link" check "Embankment"
@@ -11826,5 +12038,5 @@
 #: build/trans_presets.java:84
 msgid "Trunk"
-msgstr "Motortrafikkvei"
+msgstr "Stamvei"
 
 #. item
@@ -11833,5 +12045,5 @@
 #: build/trans_presets.java:87
 msgid "Edit Trunk"
-msgstr "Rediger Motortrafikkvei"
+msgstr "Rediger stamvei"
 
 #. item "Streets/Trunk" check "Oneway"
@@ -11848,5 +12060,5 @@
 #: build/trans_presets.java:104
 msgid "Trunk Link"
-msgstr "Motortrafikkvei tilførselvei"
+msgstr "Av-/påkjørsel for stamvei"
 
 #. item
@@ -11855,5 +12067,5 @@
 #: build/trans_presets.java:107
 msgid "Edit Trunk Link"
-msgstr "Rediger Motortrafikkvei tilførselvei"
+msgstr "Rediger av-/påkjørsel for stamvei"
 
 #. item "Streets/Trunk Link" check "Embankment"
@@ -11873,5 +12085,5 @@
 #: build/trans_presets.java:127
 msgid "Edit Primary Road"
-msgstr "Rediger Riksvei"
+msgstr "Rediger riksvei"
 
 #. item "Streets/Primary" check "Embankment"
@@ -11879,10 +12091,10 @@
 #: build/trans_presets.java:144
 msgid "Primary Link"
-msgstr "Tilførselsveg til Riksvei"
+msgstr "Av-/påkjørsel for riksvei"
 
 #. item
 #: build/trans_presets.java:145
 msgid "Edit Primary Link"
-msgstr "Rediger Riksvei"
+msgstr "Rediger av-/påkjørsel for riksvei"
 
 #. item "Streets/Primary Link" check "Embankment"
@@ -11894,5 +12106,5 @@
 #: build/trans_presets.java:160 build/trans_surveyor.java:80
 msgid "Secondary"
-msgstr "Fylkesvei"
+msgstr "Fylkesvei e.l."
 
 #. item
@@ -11902,5 +12114,5 @@
 #: build/trans_presets.java:164
 msgid "Edit Secondary Road"
-msgstr "Rediger Fylkesvei"
+msgstr "Rediger fylkesvei e.l."
 
 #. item "Streets/Secondary" check "Embankment"
@@ -11926,5 +12138,5 @@
 #: build/trans_presets.java:199 build/trans_surveyor.java:84
 msgid "Unclassified"
-msgstr "Småveier"
+msgstr "Småvei"
 
 #. item
@@ -11934,5 +12146,5 @@
 #: build/trans_presets.java:203
 msgid "Edit Unclassified Road"
-msgstr "Rediger småveier"
+msgstr "Rediger småvei"
 
 #. item "Streets/Unclassified" text "Max. speed (km/h)"
@@ -11983,5 +12195,5 @@
 #: build/trans_presets.java:218 build/trans_surveyor.java:88
 msgid "Residential"
-msgstr "Boligvei"
+msgstr "Boligfeltvei"
 
 #. item
@@ -11990,5 +12202,5 @@
 #: build/trans_presets.java:221
 msgid "Edit Residential Street"
-msgstr "Rediger Boligvei"
+msgstr "Rediger boligfeltvei"
 
 #. item "Streets/Residential" combo "Layer"
@@ -12100,5 +12312,5 @@
 #: build/trans_presets.java:261
 msgid "Serviceway type"
-msgstr "Adkomstvei type"
+msgstr "Type adkomstvei"
 
 #. item "Streets/Service" combo "Serviceway type"
@@ -12140,5 +12352,5 @@
 #: build/trans_presets.java:291
 msgid "Edit Road of unknown type"
-msgstr "Rediger Vei av ukjent type"
+msgstr "Rediger vei av ukjent type"
 
 #. item "Streets/Road (Unknown Type)" text "Width (meters)"
@@ -12177,4 +12389,64 @@
 msgid "Access"
 msgstr "Adkomst"
+
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "ja"
 
 #. color permissive
@@ -12199,5 +12471,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "privat"
@@ -12245,5 +12517,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "destinasjon"
@@ -12280,5 +12552,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "permissive"
@@ -12297,4 +12569,28 @@
 msgid "agricultural"
 msgstr "Skog- og Landbruk"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "nei"
 
 #: build/trans_presets.java:315
@@ -12418,5 +12714,5 @@
 #: build/trans_presets.java:335
 msgid "Edit Junction"
-msgstr "Rediger Kryss"
+msgstr "Rediger kryss"
 
 #. item "Streets/Roundabout" label "Edit Junction"
@@ -12510,6 +12806,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "motorway"
@@ -12535,6 +12831,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "trunk"
@@ -12560,6 +12856,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "riksvei"
@@ -12585,6 +12881,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "fylkesvei"
@@ -12598,5 +12894,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "kommunevei"
@@ -12614,5 +12910,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "boligvei"
@@ -12630,5 +12926,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "adkomstvei"
@@ -12655,6 +12968,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "veiarbeid"
@@ -12667,10 +12980,10 @@
 #: build/trans_presets.java:356
 msgid "Edit Bridge"
-msgstr "Rediger Bro"
+msgstr "Rediger bro"
 
 #. item
 #: build/trans_presets.java:368
 msgid "Edit Tunnel"
-msgstr "Rediger Tunnel"
+msgstr "Rediger tunnel"
 
 #. item "Streets/Tunnel" text "Width (meters)"
@@ -12683,10 +12996,10 @@
 #: build/trans_presets.java:383
 msgid "Construction"
-msgstr "Veiarbeide"
+msgstr "Veiarbeid"
 
 #. item
 #: build/trans_presets.java:384
 msgid "Edit Highway Under Construction"
-msgstr "Rediger Vei under bygging"
+msgstr "Rediger vei under bygging"
 
 #: build/trans_presets.java:400
@@ -12704,5 +13017,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -12719,5 +13032,5 @@
 #: build/trans_presets.java:408
 msgid "Edit Bridleway"
-msgstr "Rediger Ridevei"
+msgstr "Rediger ridevei"
 
 #. item "Ways/Bridleway" text "Width (meters)"
@@ -12733,5 +13046,5 @@
 #: build/trans_presets.java:428
 msgid "Edit Cycleway"
-msgstr "Rediger Sykkelvei"
+msgstr "Rediger sykkelvei"
 
 #. item "Ways/Cycleway" text "Width (meters)"
@@ -12746,5 +13059,5 @@
 #: build/trans_presets.java:447
 msgid "Edit Footway"
-msgstr "Rediger Gangvei"
+msgstr "Rediger gangvei"
 
 #. item "Ways/Footway" text "Width (meters)"
@@ -12759,5 +13072,5 @@
 #: build/trans_presets.java:466
 msgid "Edit Pedestrian Street"
-msgstr "Rediger Gågate"
+msgstr "Rediger gågate"
 
 #. item "Ways/Pedestrian" text "Width (meters)"
@@ -12773,5 +13086,5 @@
 #: build/trans_presets.java:485
 msgid "Edit Flight of Steps"
-msgstr "Rediger Trapper"
+msgstr "Rediger trapper"
 
 #. item "Ways/Steps" text "Width (meters)"
@@ -12787,5 +13100,5 @@
 #: build/trans_presets.java:505
 msgid "Edit Track"
-msgstr "Rediger Traktorvei"
+msgstr "Rediger traktorvei"
 
 #: build/trans_presets.java:514 build/trans_presets.java:535
@@ -12828,5 +13141,5 @@
 #: build/trans_presets.java:525
 msgid "Edit Track of grade 1"
-msgstr "Rediger Traktorvei klasse 1"
+msgstr "Rediger traktorvei klasse 1"
 
 #. item "Ways/Track Grade 1" text "Width (meters)"
@@ -12841,5 +13154,5 @@
 #: build/trans_presets.java:546
 msgid "Edit Track of grade 2"
-msgstr "RedigerTraktorvei klasse 2"
+msgstr "Rediger traktorvei klasse 2"
 
 #. item "Ways/Track Grade 2" text "Width (meters)"
@@ -12854,5 +13167,5 @@
 #: build/trans_presets.java:567
 msgid "Edit Track of grade 3"
-msgstr "RedigerTraktorvei klasse 3"
+msgstr "Rediger traktorvei klasse 3"
 
 #. item "Ways/Track Grade 3" text "Width (meters)"
@@ -12867,5 +13180,5 @@
 #: build/trans_presets.java:588
 msgid "Edit Track of grade 4"
-msgstr "RedigerTraktorvei klasse 4"
+msgstr "Rediger traktorvei klasse 4"
 
 #. item "Ways/Track Grade 4" text "Width (meters)"
@@ -12880,5 +13193,5 @@
 #: build/trans_presets.java:609
 msgid "Edit Track of grade 5"
-msgstr "Rediger Traktorvei klasse 5"
+msgstr "Rediger traktorvei klasse 5"
 
 #. item "Ways/Track Grade 5" text "Width (meters)"
@@ -12894,5 +13207,5 @@
 #: build/trans_presets.java:631
 msgid "Edit Path"
-msgstr "Rediger Sti"
+msgstr "Rediger sti"
 
 #: build/trans_presets.java:637
@@ -12916,5 +13229,5 @@
 #: build/trans_presets.java:659
 msgid "Edit Hiking"
-msgstr "Rediger Tursti"
+msgstr "Rediger tursti"
 
 #. item "Ways/Hiking" text "Width (meters)"
@@ -12930,5 +13243,5 @@
 #: build/trans_presets.java:672
 msgid "Edit Mountain Hiking"
-msgstr "Rediger Fjellsti"
+msgstr "Rediger fjellsti"
 
 #. item "Ways/Mountain Hiking" text "Width (meters)"
@@ -12936,5 +13249,5 @@
 #: build/trans_presets.java:681
 msgid "Demanding Mountain Hiking"
-msgstr "Krevende Fjellsti"
+msgstr "Krevende fjellsti"
 
 #. item
@@ -12944,5 +13257,5 @@
 #: build/trans_presets.java:685
 msgid "Edit Demanding Mountain Hiking"
-msgstr "Rediger Krevende Fjellsti"
+msgstr "Rediger krevende fjellsti"
 
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
@@ -12950,5 +13263,5 @@
 #: build/trans_presets.java:694
 msgid "Alpine Hiking"
-msgstr "Alpin Fjellsti"
+msgstr "Alpin fjellsti"
 
 #. item
@@ -12958,5 +13271,5 @@
 #: build/trans_presets.java:698
 msgid "Edit Alpine Hiking"
-msgstr "Rediger Alpin Fjellsti"
+msgstr "Rediger alpin fjellsti"
 
 #. item "Ways/Alpine Hiking" text "Width (meters)"
@@ -12964,5 +13277,5 @@
 #: build/trans_presets.java:707
 msgid "Demanding Alpine Hiking"
-msgstr "Krevende Alpin Fjellsti"
+msgstr "Krevende alpin fjellsti"
 
 #. item
@@ -12972,5 +13285,5 @@
 #: build/trans_presets.java:711
 msgid "Edit Demanding Alpine Hiking"
-msgstr "Rediger Krevende Alpin Fjellsti"
+msgstr "Rediger krevende alpin fjellsti"
 
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
@@ -12978,5 +13291,5 @@
 #: build/trans_presets.java:720
 msgid "Difficult Alpine Hiking"
-msgstr "Vanskelig Alpin Fjellsti"
+msgstr "Vanskelig alpin fjellsti"
 
 #. item
@@ -12986,5 +13299,5 @@
 #: build/trans_presets.java:724
 msgid "Edit Difficult Alpine Hiking"
-msgstr "Rediger Vanskelig Alpin Fjellsti"
+msgstr "Rediger vanskelig alpin fjellsti"
 
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
@@ -12992,10 +13305,10 @@
 #: build/trans_presets.java:734
 msgid "Waypoints"
-msgstr "Waypoint"
+msgstr "Veipunkt"
 
 #. group "Waypoints"
 #: build/trans_presets.java:735
 msgid "Motorway Junction"
-msgstr "Motorvei Kryss"
+msgstr "Motorveikryss"
 
 #. item
@@ -13003,5 +13316,5 @@
 #: build/trans_presets.java:737
 msgid "Edit Motorway Junction"
-msgstr "Rediger Motorvei Kryss"
+msgstr "Rediger motorveikryss"
 
 #. item "Waypoints/Motorway Junction" text "Name"
@@ -13019,5 +13332,5 @@
 #: build/trans_presets.java:745
 msgid "Edit Service Station"
-msgstr "Rediger Service område"
+msgstr "Rediger Serviceområde"
 
 #. item "Waypoints/Services" text "Name"
@@ -13061,5 +13374,5 @@
 #: build/trans_presets.java:3001
 msgid "Operator"
-msgstr "Driver"
+msgstr "Operatør"
 
 #. item "Waypoints/Services" text "Operator"
@@ -13076,5 +13389,5 @@
 #: build/trans_presets.java:758
 msgid "Pedestrian crossing type"
-msgstr "Gangfelt type"
+msgstr "Type gangfelt"
 
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
@@ -13105,5 +13418,5 @@
 #: build/trans_presets.java:1307
 msgid "Cross on horseback"
-msgstr "Kryssende Ridevei"
+msgstr "Kryssende ridevei"
 
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
@@ -13112,5 +13425,5 @@
 #: build/trans_presets.java:1308
 msgid "Cross by bicycle"
-msgstr "Kryssende Sykkelvei"
+msgstr "Kryssende sykkelvei"
 
 #. item "Waypoints/Traffic Signal" check "Cross by bicycle"
@@ -13120,5 +13433,5 @@
 #: build/trans_presets.java:1309
 msgid "Crossing attendant"
-msgstr "Betjent Fotgjengerfelt"
+msgstr "Betjent fotgjengerfelt"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
@@ -13156,5 +13469,5 @@
 #: build/trans_presets.java:765
 msgid "Stop"
-msgstr "Full Stopp"
+msgstr "Full stopp"
 
 #. item
@@ -13178,5 +13491,5 @@
 #: build/trans_presets.java:779
 msgid "Mini-roundabout"
-msgstr "Mini Rundkjøring"
+msgstr "Mini-rundkjøring"
 
 #. item
@@ -13209,10 +13522,10 @@
 #: build/trans_presets.java:792
 msgid "Edit City Limit Sign"
-msgstr "Rediger bygrense skilt"
+msgstr "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Name"
 #: build/trans_presets.java:797
 msgid "Second Name"
-msgstr "Annet Navn"
+msgstr "Annet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
@@ -13249,5 +13562,5 @@
 #: build/trans_presets.java:813
 msgid "Edit Ford"
-msgstr "Rediger Vadested"
+msgstr "Rediger vadested"
 
 #. item "Waypoints/Ford" text "Name"
@@ -13261,5 +13574,5 @@
 #: build/trans_presets.java:822
 msgid "Edit Mountain Pass"
-msgstr "Rediger Fjellpass"
+msgstr "Rediger fjellpass"
 
 #. item "Waypoints/Mountain Pass" text "Name"
@@ -13273,5 +13586,5 @@
 #: build/trans_presets.java:2702 build/trans_presets.java:2709
 msgid "Elevation"
-msgstr "H.O.H."
+msgstr "Høyde"
 
 #. item "Waypoints/Mountain Pass" text "Elevation"
@@ -13365,5 +13678,5 @@
 #: build/trans_presets.java:865
 msgid "Bus Trap"
-msgstr "Buss Sluse"
+msgstr "Bussluse"
 
 #. item
@@ -13371,10 +13684,10 @@
 #: build/trans_presets.java:868
 msgid "Spikes"
-msgstr "Pigg hinder"
+msgstr "Pigghinder"
 
 #. item
 #: build/trans_presets.java:869
 msgid "Edit Spikes"
-msgstr "Rediger Pigg Hinder"
+msgstr "Rediger pigghinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
@@ -13398,5 +13711,5 @@
 #: build/trans_presets.java:891
 msgid "Edit Border Control"
-msgstr "Rediger Tollstasjon"
+msgstr "Rediger tollstasjon"
 
 #. item "Barriers/Border Control" check "Motorcar"
@@ -13448,5 +13761,5 @@
 #: build/trans_presets.java:928
 msgid "Edit Entrance"
-msgstr "Rediger Inngang"
+msgstr "Rediger inngang"
 
 #. item "Barriers/Entrance" check "Motorcar"
@@ -13459,5 +13772,5 @@
 #: build/trans_presets.java:941
 msgid "Edit Gate"
-msgstr "Rediger Port"
+msgstr "Rediger port"
 
 #. item "Barriers/Gate" check "Motorcar"
@@ -13469,5 +13782,5 @@
 #: build/trans_presets.java:953
 msgid "Edit Lift Gate"
-msgstr "Rediger Veibom"
+msgstr "Rediger veibom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
@@ -13489,5 +13802,5 @@
 #: build/trans_presets.java:977
 msgid "Edit Bump Gate"
-msgstr "Rediger Støtfangergjerde"
+msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
@@ -13510,15 +13823,15 @@
 #: build/trans_presets.java:999
 msgid "Edit Stile"
-msgstr "Rediger Gjerdetrapp"
+msgstr "Rediger gjerdetrapp"
 
 #. item "Barriers/Stile" check "Bicycle"
 #: build/trans_presets.java:1007
 msgid "Sally Port"
-msgstr "Sluse Port"
+msgstr "Sortiport"
 
 #. item
 #: build/trans_presets.java:1008
 msgid "Edit Sally Port"
-msgstr "Rediger Sluse Port"
+msgstr "Rediger sortiport"
 
 #. item "Barriers/Sally Port" check "Motorcar"
@@ -13534,5 +13847,5 @@
 #: build/trans_presets.java:1023
 msgid "Spring"
-msgstr "Vann Kilde"
+msgstr "Vannkilde"
 
 #. item
@@ -13540,5 +13853,5 @@
 #: build/trans_presets.java:1025
 msgid "Edit Spring"
-msgstr "Rediger Vannkilde"
+msgstr "Rediger vannkilde"
 
 #. item "Water/Spring" text "Name"
@@ -13552,5 +13865,5 @@
 #: build/trans_presets.java:1032
 msgid "Edit Drain"
-msgstr "Rediger Drenering"
+msgstr "Rediger drenering"
 
 #. item "Water/Drain" combo "Layer"
@@ -13563,5 +13876,5 @@
 #: build/trans_presets.java:1040
 msgid "Edit Stream"
-msgstr "Rediger Bekk"
+msgstr "Rediger bekk"
 
 #. item "Water/Stream" combo "Layer"
@@ -13574,5 +13887,5 @@
 #: build/trans_presets.java:1048
 msgid "Edit Canal"
-msgstr "Rediger Kanal"
+msgstr "Rediger kanal"
 
 #. item "Water/Canal" combo "Layer"
@@ -13587,5 +13900,5 @@
 #: build/trans_presets.java:1058
 msgid "Edit River"
-msgstr "Rediger Elv"
+msgstr "Rediger elv"
 
 #. item
@@ -13593,5 +13906,5 @@
 #: build/trans_presets.java:1067
 msgid "Edit Water"
-msgstr "Rediger Vann"
+msgstr "Rediger vann"
 
 #. item "Water/Water" text "Name"
@@ -13603,5 +13916,5 @@
 #: build/trans_presets.java:1072
 msgid "Edit Land"
-msgstr "Rediger Land"
+msgstr "Rediger land"
 
 #. item "Water/Land" text "Name"
@@ -13614,5 +13927,5 @@
 #: build/trans_presets.java:1078
 msgid "Edit Basin Landuse"
-msgstr "Rediger Basseng"
+msgstr "Rediger basseng"
 
 #. item "Water/Basin" text "Name"
@@ -13625,15 +13938,15 @@
 #: build/trans_presets.java:1085
 msgid "Edit Reservoir Landuse"
-msgstr "Rediger Drikkevannskilde"
+msgstr "Rediger drikkevannskilde"
 
 #. item "Water/Reservoir" text "Name"
 #: build/trans_presets.java:1090
 msgid "Covered Reservoir"
-msgstr "Tildekt Drikkevannskilde"
+msgstr "Tildekt drikkevannskilde"
 
 #. item
 #: build/trans_presets.java:1091
 msgid "Edit Covered Reservoir"
-msgstr "Rediger Tildekt Drikkevannskilde"
+msgstr "Rediger tildekt drikkevannskilde"
 
 #. item "Water/Covered Reservoir" text "Name"
@@ -13662,5 +13975,5 @@
 #: build/trans_presets.java:1108
 msgid "Edit Wetland"
-msgstr "Rediger Våtmarksområde"
+msgstr "Rediger våtmarksområde"
 
 #. item "Water/Wetland" combo "Type"
@@ -13681,5 +13994,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "Myrområde"
@@ -13695,9 +14008,9 @@
 #: build/trans_presets.java:1111
 msgid "tidalflat"
-msgstr "tidevannsflate"
+msgstr "Tidevannsflate"
 
 #: build/trans_presets.java:1111
 msgid "mangrove"
-msgstr "mangrove"
+msgstr "Mangrove"
 
 #: build/trans_presets.java:1113
@@ -13719,5 +14032,5 @@
 #: build/trans_presets.java:1120
 msgid "Edit Beach"
-msgstr "Rediger Strand"
+msgstr "Rediger strand"
 
 #. item "Water/Beach" text "Name"
@@ -13729,5 +14042,5 @@
 #: build/trans_presets.java:1125
 msgid "Edit Bay"
-msgstr "Rediger Havbukt"
+msgstr "Rediger havbukt"
 
 #. item "Water/Bay" text "Name"
@@ -13740,5 +14053,5 @@
 #: build/trans_presets.java:1131
 msgid "Edit Cliff"
-msgstr "Rediger Klippe"
+msgstr "Rediger klippe"
 
 #. item "Water/Cliff" text "Name"
@@ -13751,5 +14064,5 @@
 #: build/trans_presets.java:1137
 msgid "Edit Coastline"
-msgstr "Rediger Kystlinje"
+msgstr "Rediger kystlinje"
 
 #. item "Water/Coastline" text "Name"
@@ -13763,5 +14076,5 @@
 #: build/trans_presets.java:1144
 msgid "Edit Ferry"
-msgstr "Rediger Fergerute"
+msgstr "Rediger fergerute"
 
 #. item "Water/Ferry Route" text "Name"
@@ -13776,5 +14089,5 @@
 #: build/trans_presets.java:1154
 msgid "Edit Boatyard"
-msgstr "Rediger Skipsverft"
+msgstr "Rediger skipsverft"
 
 #. item "Water/Boatyard" text "Name"
@@ -13787,5 +14100,5 @@
 #: build/trans_presets.java:1161
 msgid "Edit Dock"
-msgstr "Rediger Tørrdokk"
+msgstr "Rediger tørrdokk"
 
 #. item "Water/Dock" text "Name"
@@ -13793,5 +14106,5 @@
 #: build/trans_presets.java:1167
 msgid "Dam"
-msgstr "Dam"
+msgstr "Demning"
 
 #. item
@@ -13799,5 +14112,5 @@
 #: build/trans_presets.java:1169
 msgid "Edit Dam"
-msgstr "Rediger Dam"
+msgstr "Rediger demning"
 
 #. item "Water/Dam" text "Name"
@@ -13809,5 +14122,5 @@
 #: build/trans_presets.java:1176
 msgid "Lock Gate"
-msgstr "SlusePort"
+msgstr "Sluseport"
 
 #. item
@@ -13822,5 +14135,5 @@
 #: build/trans_presets.java:1182
 msgid "Edit Weir"
-msgstr "Rediger Terskeldam"
+msgstr "Rediger terskeldam"
 
 #. item "Waterway Point/Weir" text "Name"
@@ -13832,5 +14145,5 @@
 #: build/trans_presets.java:1188
 msgid "Edit Waterfall"
-msgstr "Rediger Foss"
+msgstr "Rediger foss"
 
 #. item "Waterway Point/Waterfall" text "Name"
@@ -13849,5 +14162,5 @@
 #: build/trans_presets.java:1198
 msgid "Edit Marina"
-msgstr "Rediger Marina"
+msgstr "Rediger marina"
 
 #. item "Waterway Point/Marina" text "Name"
@@ -13860,5 +14173,5 @@
 #: build/trans_presets.java:1204
 msgid "Edit Pier"
-msgstr "Rediger Brygge"
+msgstr "Rediger brygge"
 
 #. item "Waterway Point/Pier" text "Name"
@@ -13871,5 +14184,5 @@
 #: build/trans_presets.java:1210
 msgid "Edit Ferry Terminal"
-msgstr "Rediger Fergeleie"
+msgstr "Rediger fergeleie"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
@@ -13884,5 +14197,5 @@
 #: build/trans_presets.java:1218
 msgid "Edit Slipway"
-msgstr "Rediger Båtslipp"
+msgstr "Rediger båtslipp"
 
 #. item "Waterway Point/Slipway" text "Name"
@@ -13901,5 +14214,5 @@
 #: build/trans_presets.java:1227
 msgid "Edit Rail"
-msgstr "Rediger Jernbane"
+msgstr "Rediger jernbane"
 
 #. item "Railway/Rail" label "Edit Rail"
@@ -13932,5 +14245,5 @@
 #: build/trans_presets.java:1267 build/trans_presets.java:1292
 msgid "Optional Types"
-msgstr "Alternative Typer"
+msgstr "Alternative typer"
 
 #. item "Railway/Rail" combo "Optional Types"
@@ -13961,14 +14274,14 @@
 #: build/trans_presets.java:1267 build/trans_presets.java:1292
 msgid "spur"
-msgstr "Privat Sidespor"
+msgstr "Privat sidespor"
 
 #: build/trans_presets.java:1232
 msgid "Narrow Gauge Rail"
-msgstr "Smalspor Jernbane"
+msgstr "Smal jernbane"
 
 #. item
 #: build/trans_presets.java:1233
 msgid "Edit Narrow Gauge Rail"
-msgstr "Rediger Smalspor Jernbane"
+msgstr "Rediger smal jernbane"
 
 #: build/trans_presets.java:1238
@@ -13989,14 +14302,14 @@
 #: build/trans_presets.java:1246
 msgid "Edit Preserved Railway"
-msgstr "Rediger Fredet bane"
+msgstr "Rediger fredet bane"
 
 #: build/trans_presets.java:1251
 msgid "Light Rail"
-msgstr "Trikk"
+msgstr "Bybane"
 
 #. item
 #: build/trans_presets.java:1252
 msgid "Edit Light Rail"
-msgstr "Rediger Trikk"
+msgstr "Rediger bybane"
 
 #: build/trans_presets.java:1257
@@ -14011,14 +14324,14 @@
 #: build/trans_presets.java:1263
 msgid "Tram"
-msgstr "Tram"
+msgstr "Trikk"
 
 #. item
 #: build/trans_presets.java:1264
 msgid "Edit Tram"
-msgstr "Edit Tram"
+msgstr "Rediger trikk"
 
 #: build/trans_presets.java:1269
 msgid "Bus Guideway"
-msgstr "Bussholdeplass"
+msgstr "Busspor"
 
 #. item
@@ -14026,5 +14339,5 @@
 #: build/trans_presets.java:1271
 msgid "Edit Bus Guideway"
-msgstr "Rediger Bussholdeplass"
+msgstr "Rediger busspor"
 
 #. item "Railway/Bus Guideway" text "Width (meters)"
@@ -14033,14 +14346,14 @@
 #: build/trans_presets.java:1288
 msgid "Disused Rail"
-msgstr "Nedlagt Jernbane"
+msgstr "Nedlagt jernbane"
 
 #. item
 #: build/trans_presets.java:1289
 msgid "Edit Disused Railway"
-msgstr "Rediger Nedlagt Jernbane"
+msgstr "Rediger nedlagt jernbane"
 
 #: build/trans_presets.java:1294
 msgid "Abandoned Rail"
-msgstr "Revet Jernbane"
+msgstr "Revet jernbane"
 
 #. item
@@ -14064,5 +14377,5 @@
 #: build/trans_presets.java:1306
 msgid "Crossing type"
-msgstr "Fotgjengerfelt type"
+msgstr "Type fotgjengerfelt"
 
 #. item "Railway/Crossing" check "Crossing attendant"
@@ -14088,5 +14401,5 @@
 #: build/trans_presets.java:1320
 msgid "Edit Chair Lift"
-msgstr "Rediger Stolheis"
+msgstr "Rediger stolheis"
 
 #. item "Aerialway/Chair Lift" text "Name"
@@ -14110,5 +14423,5 @@
 #: build/trans_presets.java:1332
 msgid "Edit Cable Car"
-msgstr "Rediger Taubane"
+msgstr "Rediger taubane"
 
 #. item "Aerialway/Cable Car" text "Name"
@@ -14121,5 +14434,5 @@
 #: build/trans_presets.java:1338
 msgid "Edit Gondola"
-msgstr "Rediger Gondolbane"
+msgstr "Rediger gondolbane"
 
 #. item "Aerialway/Gondola" text "Name"
@@ -14136,5 +14449,5 @@
 #: build/trans_presets.java:1344 build/trans_presets.java:1433
 msgid "Edit Station"
-msgstr "Rediger Stasjon"
+msgstr "Rediger stasjon"
 
 #. group "Car"
@@ -14149,5 +14462,5 @@
 #: build/trans_presets.java:1355
 msgid "Edit Fuel"
-msgstr "Rediger Bensinstasjon"
+msgstr "Rediger bensinstasjon"
 
 #. item "Car/Fuel" text "Operator"
@@ -14171,5 +14484,5 @@
 #: build/trans_presets.java:1363
 msgid "Edit Parking"
-msgstr "Rediger Parkering"
+msgstr "Rediger parkering"
 
 #. item "Car/Parking" text "Name"
@@ -14182,5 +14495,5 @@
 #: build/trans_presets.java:1367
 msgid "surface"
-msgstr "overflateparkering"
+msgstr "Overflateparkering"
 
 #: build/trans_presets.java:1367
@@ -14194,9 +14507,9 @@
 #: build/trans_presets.java:1367
 msgid "park_and_ride"
-msgstr "park_and_ride"
+msgstr "Innfartsparkering"
 
 #: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
-msgstr "Handicap Parkering"
+msgstr "Handicap-plasser"
 
 #. item "Amenities/Toilets" text "Reference number"
@@ -14213,5 +14526,5 @@
 #: build/trans_presets.java:1372
 msgid "Edit Car Wash"
-msgstr "Rediger Bilvask"
+msgstr "Rediger bilvask"
 
 #. item "Car/Wash" text "Operator"
@@ -14235,5 +14548,5 @@
 #: build/trans_presets.java:1385
 msgid "Edit Car Repair"
-msgstr "Rediger Verksted"
+msgstr "Rediger verksted"
 
 #. item "Car/Repair" text "Operator"
@@ -14241,5 +14554,5 @@
 #: build/trans_presets.java:1390 build/trans_presets.java:1414
 msgid "Rental"
-msgstr "Bil Utleie"
+msgstr "Bilutleie"
 
 #. item
@@ -14248,5 +14561,5 @@
 #: build/trans_presets.java:1393
 msgid "Edit Car Rental"
-msgstr "Rediger Bil Utleie"
+msgstr "Rediger bilutleie"
 
 #. item "Car/Rental" text "Operator"
@@ -14259,5 +14572,5 @@
 #: build/trans_presets.java:1400
 msgid "Edit Car Sharing"
-msgstr "Rediger Bildeling"
+msgstr "Rediger bildeling"
 
 #. item
@@ -14265,5 +14578,5 @@
 #: build/trans_presets.java:1409
 msgid "Edit Bicycle Parking"
-msgstr "Rediger Sykkelparkering"
+msgstr "Rediger sykkelparkering"
 
 #. item
@@ -14272,5 +14585,5 @@
 #: build/trans_presets.java:1417
 msgid "Edit Bicycle Rental"
-msgstr "Rediger Sykkelutleie"
+msgstr "Rediger sykkelutleie"
 
 #. item
@@ -14279,15 +14592,15 @@
 #: build/trans_presets.java:1424
 msgid "Edit Bicycle Shop"
-msgstr "Rediger Sykkelbutikk"
+msgstr "Rediger sykkelbutikk"
 
 #. item "Bicycle/Shop" text "Name"
 #: build/trans_presets.java:1429
 msgid "Public Transport"
-msgstr "Offentlig Transport"
+msgstr "Offentlig transport"
 
 #. item "Public Transport/Station" text "Name"
 #: build/trans_presets.java:1438
 msgid "UIC-Reference"
-msgstr "Innternasjonal UIC-Jernbane kode"
+msgstr "Internasjonal UIC-jernbanekode"
 
 #. item "Public Transport/Station" text "UIC-Reference"
@@ -14295,5 +14608,5 @@
 #: build/trans_presets.java:1441
 msgid "Railway Halt"
-msgstr "Jernbane Stoppested"
+msgstr "Jernbanestopp"
 
 #. item
@@ -14301,5 +14614,5 @@
 #: build/trans_presets.java:1443
 msgid "Edit Halt"
-msgstr "Rediger Fullstopp"
+msgstr "Rediger jernbanestopp"
 
 #. item "Public Transport/Railway Halt" text "Name"
@@ -14314,5 +14627,5 @@
 #: build/trans_presets.java:1453
 msgid "Edit Tram Stop"
-msgstr "Rediger Trikkestopp"
+msgstr "Rediger trikkestopp"
 
 #. item "Public Transport/Tram Stop" text "Name"
@@ -14320,5 +14633,5 @@
 #: build/trans_presets.java:1460
 msgid "Railway Platform"
-msgstr "Jernbane Plattform"
+msgstr "Jernbaneplattform"
 
 #. item
@@ -14327,5 +14640,5 @@
 #: build/trans_presets.java:1463
 msgid "Edit Railway Platform"
-msgstr "Rediger Jernbane Plattform"
+msgstr "Rediger jernbaneplattform"
 
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
@@ -14337,5 +14650,5 @@
 #: build/trans_presets.java:1466 build/trans_presets.java:1508
 msgid "Reference (track number)"
-msgstr "Ref (spor nr)"
+msgstr "Spornummer"
 
 #. item "Public Transport/Railway Platform" text "Width (meters)"
@@ -14348,5 +14661,5 @@
 #: build/trans_presets.java:1470
 msgid "Subway Entrance"
-msgstr "T-bane Inngang"
+msgstr "T-baneinngang"
 
 #. item
@@ -14355,5 +14668,5 @@
 #: build/trans_presets.java:1473
 msgid "Edit Subway Entrance"
-msgstr "Rediger T-bane Inngang"
+msgstr "Rediger T-baneinngang"
 
 #. item "Public Transport/Subway Entrance" text "Name"
@@ -14367,5 +14680,5 @@
 #: build/trans_presets.java:1483
 msgid "Bus Station"
-msgstr "Buss Stasjon"
+msgstr "Busstasjon"
 
 #. item
@@ -14374,5 +14687,5 @@
 #: build/trans_presets.java:1486
 msgid "Edit Bus Station"
-msgstr "Rediger Buss Stasjon"
+msgstr "Rediger busstasjon"
 
 #. item "Public Transport/Bus Station" text "Name"
@@ -14380,5 +14693,5 @@
 #: build/trans_presets.java:1492
 msgid "Bus Stop"
-msgstr "Buss Holdeplass"
+msgstr "Bussholdeplass"
 
 #. item
@@ -14388,5 +14701,5 @@
 #: build/trans_presets.java:1496
 msgid "Edit Bus Stop"
-msgstr "Rediger Buss Holdeplass"
+msgstr "Rediger bussholdeplass"
 
 #. item "Public Transport/Bus Stop" text "Name"
@@ -14398,5 +14711,5 @@
 #: build/trans_presets.java:2349
 msgid "Shelter"
-msgstr "Ly for Natten"
+msgstr "Ly for natten"
 
 #. item "Public Transport/Bus Stop" check "Shelter"
@@ -14404,10 +14717,10 @@
 #: build/trans_presets.java:1504
 msgid "Bus Platform"
-msgstr "Buss Platform"
+msgstr "Bussplatform"
 
 #. item
 #: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
-msgstr "Rediger Buss Platform"
+msgstr "Rediger bussplattform"
 
 #. item "Public Transport/Bus Platform" check "Area"
@@ -14421,5 +14734,5 @@
 #: build/trans_presets.java:1515
 msgid "Edit Taxi station"
-msgstr "Rediger Taxi stasjon"
+msgstr "Rediger taxi-stasjon"
 
 #. item "Public Transport/Taxi" text "Name"
@@ -14433,5 +14746,5 @@
 #: build/trans_presets.java:1522
 msgid "Edit Airport"
-msgstr "Rediger Flyplass"
+msgstr "Rediger flyplass"
 
 #. item "Public Transport/Airport" text "Reference"
@@ -14467,5 +14780,5 @@
 #: build/trans_presets.java:1537
 msgid "Edit Hotel"
-msgstr "Rediger Hotell"
+msgstr "Rediger hotell"
 
 #. item "Accomodation/Hotel" text "Name"
@@ -14483,5 +14796,5 @@
 #: build/trans_presets.java:1544
 msgid "Edit Motel"
-msgstr "Rediger Motell"
+msgstr "Rediger motell"
 
 #. item "Accomodation/Motel" text "Name"
@@ -14493,5 +14806,5 @@
 #: build/trans_presets.java:1549
 msgid "Edit Guest House"
-msgstr "Rediger Gjestehus"
+msgstr "Rediger gjestehus"
 
 #. item "Accomodation/Guest House" text "Name"
@@ -14504,5 +14817,5 @@
 #: build/trans_presets.java:1555
 msgid "Edit Chalet"
-msgstr "Rediger Feriehytter"
+msgstr "Rediger feriehytter"
 
 #. item "Accomodation/Chalet" text "Name"
@@ -14515,5 +14828,5 @@
 #: build/trans_presets.java:1561
 msgid "Edit Hostel"
-msgstr "Rediger Ungdomsherberge"
+msgstr "Rediger ungdomsherberge"
 
 #. item "Accomodation/Hostel" text "Name"
@@ -14525,15 +14838,15 @@
 #: build/trans_presets.java:1566
 msgid "Edit Alpine Hut"
-msgstr "Rediger Fjellstue"
+msgstr "Rediger fjellstue"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
 #: build/trans_presets.java:1571
 msgid "Caravan Site"
-msgstr "Caravan Plass"
+msgstr "Campingvognplass"
 
 #. item
 #: build/trans_presets.java:1572
 msgid "Edit Caravan Site"
-msgstr "Rediger Caravan Plass"
+msgstr "Rediger campingvognplass"
 
 #. item "Accomodation/Caravan Site" text "Name"
@@ -14546,10 +14859,10 @@
 #: build/trans_presets.java:1578
 msgid "Edit Camping Site"
-msgstr "Rediger Campingplass"
+msgstr "Rediger campingplass"
 
 #. item "Accomodation/Camping Site" text "Name"
 #: build/trans_presets.java:1583
 msgid "Food+Drinks"
-msgstr "Mat & Drikke"
+msgstr "Mat og drikke"
 
 #. group "Food+Drinks"
@@ -14566,5 +14879,5 @@
 #: build/trans_presets.java:1586
 msgid "Edit Restaurant"
-msgstr "Rediger Restaurant"
+msgstr "Rediger restaurant"
 
 #. item "Food+Drinks/Restaurant" text "Name"
@@ -14640,9 +14953,9 @@
 #: build/trans_presets.java:1593
 msgid "Edit Fast Food Restaurant"
-msgstr "Rediger Gatekjøkken"
+msgstr "Rediger gatekjøkken"
 
 #: build/trans_presets.java:1598
 msgid "Cafe"
-msgstr "Kafe"
+msgstr "Kafé"
 
 #. item
@@ -14650,5 +14963,5 @@
 #: build/trans_presets.java:1600
 msgid "Edit Cafe"
-msgstr "Rediger Kafe"
+msgstr "Rediger kafé"
 
 #. item "Food+Drinks/Cafe" text "Name"
@@ -14661,5 +14974,5 @@
 #: build/trans_presets.java:1606
 msgid "Edit Pub"
-msgstr "Rediger Pub"
+msgstr "Rediger pub"
 
 #. item "Food+Drinks/Pub" text "Name"
@@ -14682,5 +14995,5 @@
 #: build/trans_presets.java:1617
 msgid "Edit Bar"
-msgstr "Rediger Bar"
+msgstr "Rediger bar"
 
 #. item "Food+Drinks/Bar" text "Name"
@@ -14693,5 +15006,5 @@
 #: build/trans_presets.java:1623
 msgid "Edit Nightclub"
-msgstr "Rediger Nattklubb"
+msgstr "Rediger nattklubb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
@@ -14708,5 +15021,5 @@
 #: build/trans_presets.java:1630
 msgid "Edit Attraction"
-msgstr "Rediger Attraksjon"
+msgstr "Rediger attraksjon"
 
 #. item "Tourism/Attraction" text "Name"
@@ -14716,5 +15029,5 @@
 #: build/trans_presets.java:2373
 msgid "Opening Hours"
-msgstr "Åpningstid"
+msgstr "Åpningstider"
 
 #. item "Tourism/Attraction" text "Opening Hours"
@@ -14727,5 +15040,5 @@
 #: build/trans_presets.java:1637
 msgid "Edit Museum"
-msgstr "Rediger  Museum"
+msgstr "Rediger museum"
 
 #. item "Tourism/Museum" text "Name"
@@ -14739,5 +15052,5 @@
 #: build/trans_presets.java:1644
 msgid "Edit Zoo"
-msgstr "Rediger  Zoologisk hage"
+msgstr "Rediger  zoologisk hage"
 
 #. item "Tourism/Zoo" text "Name"
@@ -14750,5 +15063,5 @@
 #: build/trans_presets.java:1650
 msgid "Edit Viewpoint"
-msgstr "Rediger Utsiktspunkt"
+msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
@@ -14765,10 +15078,10 @@
 #: build/trans_presets.java:1656
 msgid "Edit Theme Park"
-msgstr "Rediger Temapark"
+msgstr "Rediger temapark"
 
 #. item "Tourism/Theme Park" text "Name"
 #: build/trans_presets.java:1660
 msgid "Artwork"
-msgstr "Kunstutstilling"
+msgstr "Kunstverk"
 
 #. item
@@ -14776,5 +15089,5 @@
 #: build/trans_presets.java:1662
 msgid "Edit Artwork"
-msgstr "Rediger Kunstutstilling"
+msgstr "Rediger kunstverk"
 
 #. item "Tourism/Artwork" text "Name"
@@ -14782,5 +15095,5 @@
 #: build/trans_presets.java:1667
 msgid "Information Office"
-msgstr "Informasjonskontor"
+msgstr "Turistinformasjon"
 
 #. item
@@ -14788,5 +15101,5 @@
 #: build/trans_presets.java:1669
 msgid "Edit Information Office"
-msgstr "Rediger Turistinformasjon"
+msgstr "Rediger turistinformasjon"
 
 #. item "Tourism/Information Office" text "Opening Hours"
@@ -14831,5 +15144,5 @@
 #: build/trans_presets.java:1686
 msgid "Board Type"
-msgstr "Info Tavle type"
+msgstr "Tavletype"
 
 #. item "Tourism/Information Board" combo "Board Type"
@@ -14858,10 +15171,10 @@
 #: build/trans_presets.java:1696
 msgid "Other Information Points"
-msgstr "Annen Informasjon"
+msgstr "Annen informasjon"
 
 #. item
 #: build/trans_presets.java:1704
 msgid "Edit Shelter"
-msgstr "Rediger Ly for Natten"
+msgstr "Rediger ly for natten"
 
 #. item "Tourism/Shelter" text "Name"
@@ -14874,10 +15187,10 @@
 #: build/trans_presets.java:1709
 msgid "Picnic Site"
-msgstr "Picnic Plass"
+msgstr "Piknik-sted"
 
 #. item
 #: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
-msgstr "Rediger Picnic Plass"
+msgstr "Rediger piknik-sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
@@ -14896,5 +15209,5 @@
 #: build/trans_presets.java:1720
 msgid "Edit Castle"
-msgstr "Rediger Slott"
+msgstr "Rediger slott"
 
 #. item "Historic Places/Castle" text "Name"
@@ -14906,10 +15219,10 @@
 #: build/trans_presets.java:1725
 msgid "Edit Ruins"
-msgstr "Rediger Ruiner"
+msgstr "Rediger ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
 #: build/trans_presets.java:1729
 msgid "Archaeological Site"
-msgstr "Arkeologisk Plass"
+msgstr "Arkeologisk plass"
 
 #. item
@@ -14918,5 +15231,5 @@
 #: build/trans_presets.java:1732
 msgid "Edit Archaeological Site"
-msgstr "Rediger Arkeologisk Plass"
+msgstr "Rediger arkeologisk plass"
 
 #. item "Historic Places/Archaeological Site" text "Name"
@@ -14929,5 +15242,5 @@
 #: build/trans_presets.java:1738
 msgid "Edit Battlefield"
-msgstr "Rediger Slagmark"
+msgstr "Rediger slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
@@ -14940,5 +15253,5 @@
 #: build/trans_presets.java:1744
 msgid "Edit Monument"
-msgstr "Rediger Monument"
+msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
@@ -14951,15 +15264,15 @@
 #: build/trans_presets.java:1750
 msgid "Edit Memorial"
-msgstr "Rediger Minneplatte"
+msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
 #: build/trans_presets.java:1754
 msgid "Wayside Cross"
-msgstr "Kors i Veikant"
+msgstr "Kors i veikant"
 
 #. item
 #: build/trans_presets.java:1755
 msgid "Edit Wayside Cross"
-msgstr "Rediger Kors i Veikant"
+msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
@@ -14971,5 +15284,5 @@
 #: build/trans_presets.java:1760
 msgid "Edit Wayside Shrine"
-msgstr "Rediger Veialter"
+msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
@@ -14981,10 +15294,10 @@
 #: build/trans_presets.java:1766
 msgid "Water Park"
-msgstr "Svømmehall"
+msgstr "Badepark"
 
 #. item
 #: build/trans_presets.java:1767
 msgid "Edit Water Park"
-msgstr "Rediger Svømmehall"
+msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
@@ -14997,5 +15310,5 @@
 #: build/trans_presets.java:1773
 msgid "Edit Playground"
-msgstr "Rediger Lekeplass"
+msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
@@ -15007,5 +15320,5 @@
 #: build/trans_presets.java:1778
 msgid "Edit Fishing"
-msgstr "Rediger Fiskeplass"
+msgstr "Rediger fiskeplass"
 
 #. item "Leisure/Fishing" text "Name"
@@ -15023,5 +15336,5 @@
 #: build/trans_presets.java:1786
 msgid "Edit Stadium"
-msgstr "Rediger Stadion"
+msgstr "Rediger stadion"
 
 #. item "Sport Facilities/Stadium" text "Name"
@@ -15410,27 +15723,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -15478,5 +15791,5 @@
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "bowls"
-msgstr "bowling"
+msgstr "bowls"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
@@ -15498,5 +15811,5 @@
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "cricket_nets"
-msgstr "cricket_nets"
+msgstr "cricketnett"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
@@ -15607,10 +15920,10 @@
 #: build/trans_presets.java:1794
 msgid "Sports Centre"
-msgstr "Sport Senter"
+msgstr "Sportssenter"
 
 #. item
 #: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
-msgstr "Rediger Sport Senter"
+msgstr "Rediger sportssenter"
 
 #: build/trans_presets.java:1803
@@ -15621,5 +15934,5 @@
 #: build/trans_presets.java:1804
 msgid "Edit Pitch"
-msgstr "Rediger Bane"
+msgstr "Rediger bane"
 
 #: build/trans_presets.java:1812
@@ -15630,5 +15943,5 @@
 #: build/trans_presets.java:1813
 msgid "Edit Racetrack"
-msgstr "Rediger Racerbane"
+msgstr "Rediger racerbane"
 
 #: build/trans_presets.java:1821
@@ -15639,5 +15952,5 @@
 #: build/trans_presets.java:1822
 msgid "Edit Golf Course"
-msgstr "Rediger Golfbane"
+msgstr "Rediger golfbane"
 
 #. item "Sport Facilities/Golf Course" text "Name"
@@ -15649,5 +15962,5 @@
 #: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
-msgstr "Rediger Minigolf"
+msgstr "Rediger minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
@@ -15664,5 +15977,5 @@
 #: build/trans_presets.java:1834
 msgid "Edit Multi"
-msgstr "Rediger Flerbruk"
+msgstr "Rediger flerbruk"
 
 #. item "Sport/Multi" combo "type"
@@ -15737,5 +16050,5 @@
 #: build/trans_presets.java:2035 build/trans_presets.java:2041
 msgid "sports_centre"
-msgstr "sportsenter"
+msgstr "sportssenter"
 
 #: build/trans_presets.java:1837 build/trans_presets.java:1843
@@ -15775,5 +16088,5 @@
 #: build/trans_presets.java:1846
 msgid "Edit Athletics"
-msgstr "Rediger Turn"
+msgstr "Rediger turn"
 
 #: build/trans_presets.java:1851
@@ -15784,5 +16097,5 @@
 #: build/trans_presets.java:1852
 msgid "Edit Archery"
-msgstr "Rediger Bueskyting"
+msgstr "Rediger bueskyting"
 
 #: build/trans_presets.java:1857
@@ -15793,5 +16106,5 @@
 #: build/trans_presets.java:1858
 msgid "Edit Climbing"
-msgstr "Rediger Klatring"
+msgstr "Rediger klatring"
 
 #: build/trans_presets.java:1863
@@ -15802,5 +16115,5 @@
 #: build/trans_presets.java:1864
 msgid "Edit Canoeing"
-msgstr "Rediger Kano"
+msgstr "Rediger kano"
 
 #: build/trans_presets.java:1869
@@ -15811,5 +16124,5 @@
 #: build/trans_presets.java:1870
 msgid "Edit Cycling"
-msgstr "Rediger Sykling"
+msgstr "Rediger sykling"
 
 #: build/trans_presets.java:1875
@@ -15820,5 +16133,5 @@
 #: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
-msgstr "Rediger Hundeløp"
+msgstr "Rediger hundeløp"
 
 #: build/trans_presets.java:1881
@@ -15829,5 +16142,5 @@
 #: build/trans_presets.java:1882
 msgid "Edit Equestrian"
-msgstr "Rediger Ridning"
+msgstr "Rediger ridning"
 
 #: build/trans_presets.java:1887
@@ -15838,5 +16151,5 @@
 #: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
-msgstr "Rediger Hesteløp"
+msgstr "Rediger hesteløp"
 
 #: build/trans_presets.java:1893
@@ -15847,14 +16160,14 @@
 #: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
-msgstr "Rediger Gymnastikk"
+msgstr "Rediger gymnastikk"
 
 #: build/trans_presets.java:1899
 msgid "Motor Sports"
-msgstr "Motor Sport"
+msgstr "Motorsport"
 
 #. item
 #: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
-msgstr "Rediger Motor Sport"
+msgstr "Rediger motorsport"
 
 #: build/trans_presets.java:1905
@@ -15865,5 +16178,5 @@
 #: build/trans_presets.java:1906
 msgid "Edit Skating"
-msgstr "Rediger Skøyter"
+msgstr "Rediger skøyter"
 
 #: build/trans_presets.java:1911
@@ -15874,5 +16187,5 @@
 #: build/trans_presets.java:1912
 msgid "Edit Skateboard"
-msgstr "Rediger Skateboard"
+msgstr "Rediger skateboard"
 
 #: build/trans_presets.java:1917
@@ -15883,5 +16196,5 @@
 #: build/trans_presets.java:1918
 msgid "Edit Swimming"
-msgstr "Rediger Svømming"
+msgstr "Rediger svømming"
 
 #: build/trans_presets.java:1923
@@ -15893,10 +16206,10 @@
 #: build/trans_presets.java:1925
 msgid "Edit Skiing"
-msgstr "Rediger Ski"
+msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
 #: build/trans_presets.java:1928
 msgid "Piste type"
-msgstr "Løype Type"
+msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
@@ -15911,5 +16224,5 @@
 #: build/trans_presets.java:1928
 msgid "snow_park"
-msgstr "snø_park"
+msgstr "snøpark"
 
 #: build/trans_presets.java:1929
@@ -15950,5 +16263,5 @@
 #: build/trans_presets.java:1934
 msgid "Edit Shooting"
-msgstr "Rediger Skyting"
+msgstr "Rediger skyting"
 
 #: build/trans_presets.java:1940
@@ -15964,23 +16277,23 @@
 #: build/trans_presets.java:1942
 msgid "Edit Soccer"
-msgstr "Rediger Fotball"
+msgstr "Rediger fotball"
 
 #: build/trans_presets.java:1947
 msgid "Football"
-msgstr "Amerikansk Fotball"
+msgstr "Amerikansk fotball"
 
 #. item
 #: build/trans_presets.java:1948
 msgid "Edit Football"
-msgstr "Rediger Amerikansk Fotball"
+msgstr "Rediger amerikansk fotball"
 
 #: build/trans_presets.java:1953
 msgid "Australian Football"
-msgstr "Australsk Fotball"
+msgstr "Australsk fotball"
 
 #. item
 #: build/trans_presets.java:1954
 msgid "Edit Australian Football"
-msgstr "Rediger Australsk Fotball"
+msgstr "Rediger australsk fotball"
 
 #: build/trans_presets.java:1959
@@ -15991,5 +16304,5 @@
 #: build/trans_presets.java:1960
 msgid "Edit Baseball"
-msgstr "Rediger Baseball"
+msgstr "Rediger baseball"
 
 #: build/trans_presets.java:1965
@@ -16000,5 +16313,5 @@
 #: build/trans_presets.java:1966
 msgid "Edit Basketball"
-msgstr "Rediger Basketball"
+msgstr "Rediger basketball"
 
 #: build/trans_presets.java:1971
@@ -16009,5 +16322,5 @@
 #: build/trans_presets.java:1972
 msgid "Edit Golf"
-msgstr "Rediger Golf"
+msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
@@ -16023,14 +16336,14 @@
 #: build/trans_presets.java:1978
 msgid "Edit Boule"
-msgstr "Rediger Boule"
+msgstr "Rediger boule"
 
 #: build/trans_presets.java:1983
 msgid "Bowls"
-msgstr "Bowling"
+msgstr "Bowls"
 
 #. item
 #: build/trans_presets.java:1984
 msgid "Edit Bowls"
-msgstr "Rediger Bowling"
+msgstr "Rediger bowls"
 
 #: build/trans_presets.java:1989
@@ -16041,14 +16354,14 @@
 #: build/trans_presets.java:1990
 msgid "Edit Cricket"
-msgstr "Rediger Cricket"
+msgstr "Rediger cricket"
 
 #: build/trans_presets.java:1995
 msgid "Cricket Nets"
-msgstr "Cricket Nets"
+msgstr "Cricketnett"
 
 #. item
 #: build/trans_presets.java:1996
 msgid "Edit Cricket Nets"
-msgstr "Rediger Cricket Nets"
+msgstr "Rediger cricketnett"
 
 #: build/trans_presets.java:2001
@@ -16059,5 +16372,5 @@
 #: build/trans_presets.java:2002
 msgid "Edit Croquet"
-msgstr "Rediger Krocket"
+msgstr "Rediger krocket"
 
 #: build/trans_presets.java:2007
@@ -16068,5 +16381,5 @@
 #: build/trans_presets.java:2008
 msgid "Edit Hockey"
-msgstr "Rediger Ishockey"
+msgstr "Rediger ishockey"
 
 #: build/trans_presets.java:2013
@@ -16077,5 +16390,5 @@
 #: build/trans_presets.java:2014
 msgid "Edit Pelota"
-msgstr "Rediger Pelota"
+msgstr "Rediger pelota"
 
 #: build/trans_presets.java:2019
@@ -16086,5 +16399,5 @@
 #: build/trans_presets.java:2020
 msgid "Edit Racquet"
-msgstr "Rediger Racquet"
+msgstr "Rediger racquet"
 
 #: build/trans_presets.java:2025
@@ -16095,5 +16408,5 @@
 #: build/trans_presets.java:2026
 msgid "Edit Rugby"
-msgstr "Rediger Rugby"
+msgstr "Rediger rugby"
 
 #: build/trans_presets.java:2031
@@ -16104,5 +16417,5 @@
 #: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
-msgstr "Rediger Bordtennis"
+msgstr "Rediger bordtennis"
 
 #: build/trans_presets.java:2037
@@ -16113,5 +16426,5 @@
 #: build/trans_presets.java:2038
 msgid "Edit Tennis"
-msgstr "Rediger Tennis"
+msgstr "Rediger tennis"
 
 #. <separator/>
@@ -16135,5 +16448,5 @@
 #: build/trans_presets.java:2051
 msgid "Edit Public Building"
-msgstr "Rediger Offentlig bygning"
+msgstr "Rediger offentlig bygning"
 
 #. item "Buildings/Public Building" text "Name"
@@ -16146,10 +16459,10 @@
 #: build/trans_presets.java:2057
 msgid "Edit Town hall"
-msgstr "Rediger Rådhus"
+msgstr "Rediger rådhus"
 
 #. item "Buildings/Town hall" text "Name"
 #: build/trans_presets.java:2061
 msgid "Embassy"
-msgstr "Ambasade"
+msgstr "Ambassade"
 
 #. item
@@ -16157,5 +16470,5 @@
 #: build/trans_presets.java:2063
 msgid "Edit Embassy"
-msgstr "Rediger Ambasade"
+msgstr "Rediger ambassade"
 
 #. item "Buildings/Embassy" text "Name"
@@ -16169,5 +16482,5 @@
 #: build/trans_presets.java:2070
 msgid "Edit Courthouse"
-msgstr "Rediger Domstol"
+msgstr "Rediger domstol"
 
 #. item "Buildings/Courthouse" text "Name"
@@ -16181,5 +16494,5 @@
 #: build/trans_presets.java:2077
 msgid "Edit Prison"
-msgstr "Rediger Fengsel"
+msgstr "Rediger fengsel"
 
 #. item "Buildings/Prison" text "Name"
@@ -16194,5 +16507,5 @@
 #: build/trans_presets.java:2085
 msgid "Edit Police"
-msgstr "Rediger Politi"
+msgstr "Rediger politi"
 
 #. item "Buildings/Police" text "Name"
@@ -16206,5 +16519,5 @@
 #: build/trans_presets.java:2092
 msgid "Edit Fire Station"
-msgstr "Rediger Brannstasjon"
+msgstr "Rediger brannstasjon"
 
 #. item "Buildings/Fire Station" text "Name"
@@ -16217,5 +16530,5 @@
 #: build/trans_presets.java:2098
 msgid "Edit Post Office"
-msgstr "Rediger Postkontor"
+msgstr "Rediger postkontor"
 
 #. item "Buildings/Post Office" text "Name"
@@ -16228,5 +16541,5 @@
 #: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
-msgstr "Rediger Barnehage"
+msgstr "Rediger barnehage"
 
 #. item "Buildings/Kindergarten" text "Name"
@@ -16239,5 +16552,5 @@
 #: build/trans_presets.java:2110
 msgid "Edit School"
-msgstr "Rediger Skole"
+msgstr "Rediger skole"
 
 #. item "Buildings/School" text "Name"
@@ -16250,5 +16563,5 @@
 #: build/trans_presets.java:2116
 msgid "Edit University"
-msgstr "Rediger Universitet"
+msgstr "Rediger universitet"
 
 #. item "Buildings/University" text "Name"
@@ -16261,5 +16574,5 @@
 #: build/trans_presets.java:2122
 msgid "Edit College"
-msgstr "Rediger Høyskole"
+msgstr "Rediger høyskole"
 
 #. item "Buildings/College" text "Name"
@@ -16274,5 +16587,5 @@
 #: build/trans_presets.java:2130
 msgid "Edit Cinema"
-msgstr "Rediger KIno"
+msgstr "Rediger kino"
 
 #. item "Buildings/Cinema" text "Name"
@@ -16286,10 +16599,10 @@
 #: build/trans_presets.java:2137
 msgid "Edit Library"
-msgstr "Rediger Bibliotek"
+msgstr "Rediger bibliotek"
 
 #. item "Buildings/Library" text "Name"
 #: build/trans_presets.java:2141
 msgid "Arts Centre"
-msgstr "Kunstutstilling"
+msgstr "Kunstsenter"
 
 #. item
@@ -16297,5 +16610,5 @@
 #: build/trans_presets.java:2143
 msgid "Edit Arts Centre"
-msgstr "Rediger Kunstutstilling"
+msgstr "Rediger kunstsenter"
 
 #. item "Buildings/Arts Centre" text "Name"
@@ -16309,10 +16622,10 @@
 #: build/trans_presets.java:2150
 msgid "Edit Theatre"
-msgstr "Rediger Teater"
+msgstr "Rediger teater"
 
 #. item "Buildings/Theatre" text "Name"
 #: build/trans_presets.java:2154
 msgid "Place of Worship"
-msgstr "Kirke"
+msgstr "Tilbedelsessted"
 
 #. item
@@ -16322,5 +16635,5 @@
 #: build/trans_presets.java:2158
 msgid "Edit Place of Worship"
-msgstr "Rediger Kirke"
+msgstr "Rediger tilbedelsessted"
 
 #. item "Buildings/Place of Worship" text "Name"
@@ -16343,5 +16656,5 @@
 #: build/trans_presets.java:2891
 msgid "buddhist"
-msgstr "buddist"
+msgstr "buddhist"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
@@ -16426,5 +16739,5 @@
 #: build/trans_presets.java:2892
 msgid "jehovahs_witness"
-msgstr "jehovahs_vitner"
+msgstr "Jehovas vitner"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
@@ -16436,5 +16749,5 @@
 #: build/trans_presets.java:2892
 msgid "methodist"
-msgstr "methodist"
+msgstr "metodist"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
@@ -16446,10 +16759,10 @@
 #: build/trans_presets.java:2892
 msgid "orthodox"
-msgstr "orthodox"
+msgstr "ortodoks"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "pentecostal"
-msgstr "pentecostal"
+msgstr "pinsebevegelsen"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
@@ -16505,15 +16818,15 @@
 #: build/trans_presets.java:2174
 msgid "City name"
-msgstr "By / sted"
+msgstr "By/sted"
 
 #. item "Buildings/Addresses" text "City name"
 #: build/trans_presets.java:2175
 msgid "Post code"
-msgstr "Postnr"
+msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
 #: build/trans_presets.java:2176
 msgid "Country code"
-msgstr "Land kode"
+msgstr "Landskode"
 
 #. item "Buildings/Addresses" text "Country code"
@@ -16521,5 +16834,5 @@
 #: build/trans_presets.java:2179
 msgid "Address Interpolation"
-msgstr "Interpoler Adresser"
+msgstr "Interpoler adresser"
 
 #. item
@@ -16528,5 +16841,5 @@
 #: build/trans_presets.java:2182
 msgid "Edit Address Interpolation"
-msgstr "Rediger Interpolasjon"
+msgstr "Rediger interpolasjon"
 
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
@@ -16565,5 +16878,5 @@
 #: build/trans_presets.java:2189
 msgid "Edit Works"
-msgstr "Rediger Fabrikk"
+msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
@@ -16575,5 +16888,5 @@
 #: build/trans_presets.java:2194
 msgid "Edit Tower"
-msgstr "Rediger Tårn"
+msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
@@ -16585,15 +16898,15 @@
 #: build/trans_presets.java:2199
 msgid "Edit Water Tower"
-msgstr "Rediger Vanntårn"
+msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
 #: build/trans_presets.java:2203
 msgid "Gasometer"
-msgstr "Gasometer"
+msgstr "Gassbeholder"
 
 #. item
 #: build/trans_presets.java:2204
 msgid "Edit Gasometer"
-msgstr "Rediger Gasometer"
+msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
@@ -16606,5 +16919,5 @@
 #: build/trans_presets.java:2210
 msgid "Edit Lighthouse"
-msgstr "Rediger Fyrtårn"
+msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
@@ -16617,5 +16930,5 @@
 #: build/trans_presets.java:2216
 msgid "Edit Windmill"
-msgstr "Rediger Vindmølle"
+msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
@@ -16628,5 +16941,5 @@
 #: build/trans_presets.java:2222
 msgid "Edit Pipeline"
-msgstr "Rediger Rørledning"
+msgstr "Rediger rørledning"
 
 #. item "Man Made/Pipeline" text "Name"
@@ -16641,5 +16954,5 @@
 #: build/trans_presets.java:2230
 msgid "Edit Wastewater Plant"
-msgstr "Rediger Kloakkrenseanlegg"
+msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
@@ -16652,5 +16965,5 @@
 #: build/trans_presets.java:2236
 msgid "Edit Crane"
-msgstr "Rediger Kran"
+msgstr "Rediger kran"
 
 #. item "Man Made/Crane" text "Name"
@@ -16663,10 +16976,10 @@
 #: build/trans_presets.java:2242
 msgid "Edit Beacon"
-msgstr "Rediger Fyrlykt"
+msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
 #: build/trans_presets.java:2246
 msgid "Survey Point"
-msgstr "Trigpunkt"
+msgstr "Trigonometrisk punkt"
 
 #. item
@@ -16674,5 +16987,5 @@
 #: build/trans_presets.java:2248
 msgid "Edit Survey Point"
-msgstr "Rediger Trigpunkt"
+msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
@@ -16685,5 +16998,5 @@
 #: build/trans_presets.java:2254
 msgid "Edit Surveillance Camera"
-msgstr "Rediger Overvåkingskamera"
+msgstr "Rediger overvåkingskamera"
 
 #. item "Man Made/Surveillance" text "Name"
@@ -16699,5 +17012,5 @@
 #: build/trans_presets.java:2263
 msgid "Edit Power Generator"
-msgstr "Rediger Kraftverk"
+msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
@@ -16740,5 +17053,5 @@
 #: build/trans_presets.java:2271
 msgid "Edit Power Station"
-msgstr "Rediger Kraftstasjon"
+msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Operator"
@@ -16752,5 +17065,5 @@
 #: build/trans_presets.java:2278
 msgid "Edit Power Sub Station"
-msgstr "Rediger Transformatorstasjon"
+msgstr "Rediger transformatorstasjon"
 
 #. item "Man Made/Power Sub Station" text "Operator"
@@ -16758,5 +17071,5 @@
 #: build/trans_presets.java:2281 build/trans_presets.java:2297
 msgid "Line reference"
-msgstr "Kraftlinje Nr"
+msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
@@ -16772,5 +17085,5 @@
 #: build/trans_presets.java:2288
 msgid "Edit Power Tower"
-msgstr "Rediger Kraftmast"
+msgstr "Rediger kraftmast"
 
 #. item "Man Made/Power Tower" label "Edit Power Tower"
@@ -16785,5 +17098,5 @@
 #: build/trans_presets.java:2294
 msgid "Edit Power Line"
-msgstr "Rediger Kraftlinje"
+msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" text "Line reference"
@@ -16800,5 +17113,5 @@
 #: build/trans_presets.java:2302
 msgid "Amenities"
-msgstr "Bekvemligheter"
+msgstr "Fasiliteter"
 
 #. group "Amenities"
@@ -16811,5 +17124,5 @@
 #: build/trans_presets.java:2308 build/trans_presets.java:2400
 msgid "Reference number"
-msgstr "Referanse Nr"
+msgstr "Referansenummer"
 
 #. item "Shops/Vending machine" text "Reference number"
@@ -16821,5 +17134,5 @@
 #: build/trans_presets.java:2312
 msgid "Post Box"
-msgstr "Postboks"
+msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
@@ -16833,5 +17146,5 @@
 #: build/trans_presets.java:2320
 msgid "Edit Telephone"
-msgstr "Rediger Telefon"
+msgstr "Rediger telefon"
 
 #. item "Amenities/Telephone" text "Operator"
@@ -16851,5 +17164,5 @@
 #: build/trans_presets.java:2325 build/trans_presets.java:2404
 msgid "Electronic purses and Charge cards"
-msgstr "Elektronisk lommebok eller Kredittkort"
+msgstr "Elektronisk lommebok eller betalingskort"
 
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
@@ -16880,5 +17193,5 @@
 #: build/trans_presets.java:2333
 msgid "Edit Recycling station"
-msgstr "Rediger Returstasjon"
+msgstr "Rediger returstasjon"
 
 #. item "Amenities/Recycling" label "Edit Recycling station"
@@ -16928,5 +17241,5 @@
 #: build/trans_presets.java:2347
 msgid "Edit Hunting Stand"
-msgstr "Rediger Jaktpost"
+msgstr "Rediger jaktpost"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
@@ -16968,5 +17281,5 @@
 #: build/trans_presets.java:2357
 msgid "Edit Fountain"
-msgstr "Rediger Fontene"
+msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
@@ -16980,5 +17293,5 @@
 #: build/trans_presets.java:2364
 msgid "Edit Drinking Water"
-msgstr "Rediger Drikkevann"
+msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
@@ -16991,5 +17304,5 @@
 #: build/trans_presets.java:2370
 msgid "Edit Baby Hatch"
-msgstr "Rediger Stellebord"
+msgstr "Rediger stellebord"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
@@ -17006,10 +17319,10 @@
 #: build/trans_presets.java:2378
 msgid "Edit Supermarket"
-msgstr "Rediger Supermarked"
+msgstr "Rediger supermarked"
 
 #. item "Shops/Supermarket" text "Name"
 #: build/trans_presets.java:2382
 msgid "Convenience Store"
-msgstr "Mini Marked"
+msgstr "Minimarked"
 
 #. item
@@ -17017,5 +17330,5 @@
 #: build/trans_presets.java:2384
 msgid "Edit Convenience Store"
-msgstr "Rediger Mini Marked"
+msgstr "Rediger Minimarked"
 
 #. item "Shops/Convenience Store" text "Name"
@@ -17028,5 +17341,5 @@
 #: build/trans_presets.java:2390
 msgid "Edit Kiosk"
-msgstr "Rediger Kiosk"
+msgstr "Rediger kiosk"
 
 #. item "Shops/Kiosk" text "Name"
@@ -17039,5 +17352,5 @@
 #: build/trans_presets.java:2396
 msgid "Edit Vending machine"
-msgstr "Rediger Automat"
+msgstr "Rediger automat"
 
 #. item "Shops/Vending machine" label "Edit Vending machine"
@@ -17045,5 +17358,5 @@
 #: build/trans_presets.java:2398
 msgid "Vending products"
-msgstr "Automat produkter"
+msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
@@ -17054,5 +17367,5 @@
 #: build/trans_presets.java:2398
 msgid "public_transport_plans"
-msgstr "buss, trikk og togkart"
+msgstr "buss-, trikk- og togkart"
 
 #: build/trans_presets.java:2398
@@ -17134,5 +17447,5 @@
 #: build/trans_presets.java:2411
 msgid "Edit Butcher"
-msgstr "Rediger Slakter"
+msgstr "Rediger slakter"
 
 #. item "Shops/Butcher" text "Name"
@@ -17145,5 +17458,5 @@
 #: build/trans_presets.java:2417
 msgid "Edit Baker"
-msgstr "Rediger Baker"
+msgstr "Rediger baker"
 
 #. item "Shops/Baker" text "Name"
@@ -17156,20 +17469,20 @@
 #: build/trans_presets.java:2423
 msgid "Edit Florist"
-msgstr "Rediger Blomster"
+msgstr "Rediger blomster"
 
 #. item "Shops/Florist" text "Name"
 #: build/trans_presets.java:2427
 msgid "Organic"
-msgstr "Biologisk"
+msgstr "Økologisk"
 
 #. item
 #: build/trans_presets.java:2428
 msgid "Edit Organic Shop"
-msgstr "Rediger Biologisk"
+msgstr "Rediger økologisk"
 
 #. item "Shops/Organic" text "Name"
 #: build/trans_presets.java:2432
 msgid "Alcohol"
-msgstr "Sprit og Vin"
+msgstr "Sprit og vin"
 
 #. item
@@ -17177,5 +17490,5 @@
 #: build/trans_presets.java:2434
 msgid "Edit Alcohol Shop"
-msgstr "Rediger Sprit og Vin"
+msgstr "Rediger sprit og vin"
 
 #. item "Shops/Alcohol" text "Name"
@@ -17187,25 +17500,25 @@
 #: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
-msgstr "Rediger Drikke"
+msgstr "Rediger drikke"
 
 #. item "Shops/Beverages" text "Name"
 #: build/trans_presets.java:2443
 msgid "Computer"
-msgstr "Kontor og Data"
+msgstr "Dataelektronikk"
 
 #. item
 #: build/trans_presets.java:2444
 msgid "Edit Computer Shop"
-msgstr "Rediger Kontor og Data"
+msgstr "Rediger dataelektronikk"
 
 #. item "Shops/Computer" text "Name"
 #: build/trans_presets.java:2448
 msgid "Electronics"
-msgstr "Elektronisk"
+msgstr "Elektronikk"
 
 #. item
 #: build/trans_presets.java:2449
 msgid "Edit Electronics Shop"
-msgstr "Rediger Elektronisk"
+msgstr "Rediger elektronikk"
 
 #. item "Shops/Electronics" text "Name"
@@ -17217,5 +17530,5 @@
 #: build/trans_presets.java:2454
 msgid "Edit Hifi Shop"
-msgstr "Rediger Hifi"
+msgstr "Rediger hifi"
 
 #. item "Shops/Hifi" text "Name"
@@ -17227,5 +17540,5 @@
 #: build/trans_presets.java:2459
 msgid "Edit Furniture Shop"
-msgstr "Rediger Møbler"
+msgstr "Rediger møbler"
 
 #. item "Shops/Furniture" text "Name"
@@ -17238,5 +17551,5 @@
 #: build/trans_presets.java:2465
 msgid "Edit Garden Centre"
-msgstr "Rediger Hagesenter"
+msgstr "Rediger hagesenter"
 
 #. item "Shops/Garden Centre" text "Name"
@@ -17249,5 +17562,5 @@
 #: build/trans_presets.java:2471
 msgid "Edit Hardware Store"
-msgstr "Rediger Jernvarehandel"
+msgstr "Rediger jernvarehandel"
 
 #. item "Shops/Hardware" text "Name"
@@ -17260,5 +17573,5 @@
 #: build/trans_presets.java:2477
 msgid "Edit Do-it-yourself-store"
-msgstr "Rediger Byggevare"
+msgstr "Rediger byggevare"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
@@ -17270,5 +17583,5 @@
 #: build/trans_presets.java:2482
 msgid "Edit Stationery Shop"
-msgstr "Rediger Kontor"
+msgstr "Rediger kontor"
 
 #. item "Shops/Stationery" text "Name"
@@ -17280,5 +17593,5 @@
 #: build/trans_presets.java:2487
 msgid "Edit Hairdresser"
-msgstr "Rediger Frisør"
+msgstr "Rediger frisør"
 
 #. item "Shops/Hairdresser" text "Name"
@@ -17290,5 +17603,5 @@
 #: build/trans_presets.java:2492
 msgid "Edit Shoe Shop"
-msgstr "Rediger Sko"
+msgstr "Rediger sko"
 
 #. item "Shops/Shoes" text "Name"
@@ -17300,5 +17613,5 @@
 #: build/trans_presets.java:2497
 msgid "Edit Toy Shop"
-msgstr "Rediger Leker"
+msgstr "Rediger leker"
 
 #. item "Shops/Toys" text "Name"
@@ -17310,5 +17623,5 @@
 #: build/trans_presets.java:2502
 msgid "Edit Video Shop"
-msgstr "Rediger Video"
+msgstr "Rediger video"
 
 #. item "Shops/Video" text "Name"
@@ -17321,5 +17634,5 @@
 #: build/trans_presets.java:2508
 msgid "Edit Dry Cleaning"
-msgstr "Rediger Renseri"
+msgstr "Rediger renseri"
 
 #. item "Shops/Dry Cleaning" text "Name"
@@ -17332,5 +17645,5 @@
 #: build/trans_presets.java:2514
 msgid "Edit Laundry"
-msgstr "Rediger Vaskeri"
+msgstr "Rediger vaskeri"
 
 #. item "Shops/Laundry" text "Name"
@@ -17343,5 +17656,5 @@
 #: build/trans_presets.java:2520
 msgid "Edit Outdoor Shop"
-msgstr "Rediger Friluftsutstyr"
+msgstr "Rediger friluftsutstyr"
 
 #. item "Shops/Outdoor" text "Name"
@@ -17353,5 +17666,5 @@
 #: build/trans_presets.java:2525
 msgid "Edit Sports Shop"
-msgstr "Rediger Sport"
+msgstr "Rediger sport"
 
 #. item "Shops/Sports" text "Name"
@@ -17363,5 +17676,5 @@
 #: build/trans_presets.java:2530
 msgid "Edit Optician"
-msgstr "Rediger Optiker"
+msgstr "Rediger optiker"
 
 #. item "Shops/Optician" text "Name"
@@ -17379,5 +17692,5 @@
 #: build/trans_presets.java:2539
 msgid "Edit Bank"
-msgstr "Rediger Bank"
+msgstr "Rediger bank"
 
 #. item "Cash/Bank" text "Name"
@@ -17390,5 +17703,5 @@
 #: build/trans_presets.java:2544
 msgid "Money Exchange"
-msgstr "Veksle Valuta"
+msgstr "Veksle valuta"
 
 #. item
@@ -17396,5 +17709,5 @@
 #: build/trans_presets.java:2546
 msgid "Edit Money Exchange"
-msgstr "Rediger Veksle Valuta"
+msgstr "Rediger valutaveksling"
 
 #. item
@@ -17402,5 +17715,5 @@
 #: build/trans_presets.java:2552
 msgid "Edit Automated Teller Machine"
-msgstr "Rediger Minibank"
+msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
@@ -17418,5 +17731,5 @@
 #: build/trans_presets.java:2560
 msgid "Edit Doctors"
-msgstr "Rediger Lege"
+msgstr "Rediger lege"
 
 #. item "Health/Doctors" text "Name"
@@ -17428,5 +17741,5 @@
 #: build/trans_presets.java:2565
 msgid "Edit Dentist"
-msgstr "Rediger Tannlege"
+msgstr "Rediger tannlege"
 
 #. item "Health/Dentist" text "Name"
@@ -17439,5 +17752,5 @@
 #: build/trans_presets.java:2571
 msgid "Edit Pharmacy"
-msgstr "Rediger Apotek"
+msgstr "Rediger apotek"
 
 #. item "Health/Pharmacy" label "Edit Pharmacy"
@@ -17456,5 +17769,5 @@
 #: build/trans_presets.java:2578
 msgid "Edit Hospital"
-msgstr "Rediger Sykehus"
+msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
@@ -17468,5 +17781,5 @@
 #: build/trans_presets.java:2585
 msgid "Edit Emergency Access Point"
-msgstr "Rediger Redningsmøtepunkt"
+msgstr "Rediger redningsmøtepunkt"
 
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
@@ -17475,5 +17788,5 @@
 #: build/trans_presets.java:2588
 msgid "Point Number"
-msgstr "Punkt Nr"
+msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
@@ -17490,5 +17803,5 @@
 #: build/trans_presets.java:2592
 msgid "(Use international code, like +12-345-67890)"
-msgstr "(Benytt internasjonat nummer f.eks. +12-345-67890)"
+msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
@@ -17503,5 +17816,5 @@
 #: build/trans_presets.java:2598
 msgid "Edit Veterinary"
-msgstr "Rediger Veterinær"
+msgstr "Rediger veterinær"
 
 #. group "Places"
@@ -17513,5 +17826,5 @@
 #: build/trans_presets.java:2606
 msgid "Edit Continent"
-msgstr "Rediger Kontinent"
+msgstr "Rediger kontinent"
 
 #. item "Places/Continent" text "Name"
@@ -17523,5 +17836,5 @@
 #: build/trans_presets.java:2612
 msgid "Edit Country"
-msgstr "Rediger Land"
+msgstr "Rediger land"
 
 #. item "Places/Country" text "Name"
@@ -17529,10 +17842,10 @@
 #: build/trans_presets.java:2617 build/trans_presets.java:3002
 msgid "State"
-msgstr "Stat"
+msgstr "Delstat/provins"
 
 #. item
 #: build/trans_presets.java:2618
 msgid "Edit State"
-msgstr "Rediger Delstat"
+msgstr "Rediger delstat/provins"
 
 #. item "Places/State" text "Name"
@@ -17544,5 +17857,5 @@
 #: build/trans_presets.java:2624
 msgid "Edit Region"
-msgstr "Rediger Region (Fylke)"
+msgstr "Rediger region (fylke)"
 
 #. item "Places/Region" text "Name"
@@ -17554,5 +17867,5 @@
 #: build/trans_presets.java:2630
 msgid "Edit County"
-msgstr "Rediger Kommune"
+msgstr "Rediger kommune"
 
 #. item "Places/County" text "Name"
@@ -17565,5 +17878,5 @@
 #: build/trans_presets.java:2637
 msgid "Edit City"
-msgstr "Rediger Storby"
+msgstr "Rediger storby"
 
 #. item "Places/City" text "Name"
@@ -17576,10 +17889,10 @@
 #: build/trans_presets.java:2644
 msgid "Edit Town"
-msgstr "Rediger By"
+msgstr "Rediger by"
 
 #. item "Places/Town" text "Name"
 #: build/trans_presets.java:2649
 msgid "Suburb"
-msgstr "Forstad"
+msgstr "Forstad/bydel"
 
 #. item
@@ -17587,5 +17900,5 @@
 #: build/trans_presets.java:2651
 msgid "Edit Suburb"
-msgstr "Rediger Bydel"
+msgstr "Rediger forstad/bydel"
 
 #. item "Places/Suburb" text "Name"
@@ -17597,5 +17910,5 @@
 #: build/trans_presets.java:2657
 msgid "Edit Village"
-msgstr "Rediger Sted"
+msgstr "Rediger landsby"
 
 #. item "Places/Village" text "Name"
@@ -17607,5 +17920,5 @@
 #: build/trans_presets.java:2663
 msgid "Edit Hamlet"
-msgstr "Rediger Lite Tettsted"
+msgstr "Rediger grend"
 
 #. item "Places/Hamlet" text "Name"
@@ -17619,5 +17932,5 @@
 #: build/trans_presets.java:2671
 msgid "Edit Locality"
-msgstr "Rediger Stedsnavn"
+msgstr "Rediger lokalitet"
 
 #. item "Places/Locality" text "Name"
@@ -17630,5 +17943,5 @@
 #: build/trans_presets.java:2678
 msgid "Edit Island"
-msgstr "Rediger Øy"
+msgstr "Rediger øy"
 
 #. item "Places/Island" text "Name"
@@ -17642,5 +17955,5 @@
 #: build/trans_presets.java:2686
 msgid "Edit Cave Entrance"
-msgstr "Rediger Huleinngang"
+msgstr "Rediger huleinngang"
 
 #. item "Places/Cave Entrance" text "Name"
@@ -17653,5 +17966,5 @@
 #: build/trans_presets.java:2692
 msgid "Edit Peak"
-msgstr "Rediger Fjelltopp"
+msgstr "Rediger fjelltopp"
 
 #. item "Places/Peak" text "Elevation"
@@ -17664,5 +17977,5 @@
 #: build/trans_presets.java:2699
 msgid "Edit Glacier"
-msgstr "Rediger Isbre"
+msgstr "Rediger isbre"
 
 #. item "Places/Glacier" text "Elevation"
@@ -17675,5 +17988,5 @@
 #: build/trans_presets.java:2706
 msgid "Edit Volcano"
-msgstr "Rediger Vulkan"
+msgstr "Rediger vulkan"
 
 #. item "Places/Volcano" text "Elevation"
@@ -17690,5 +18003,5 @@
 #: build/trans_presets.java:2714
 msgid "Edit National Boundary"
-msgstr "Rediger Landegrense"
+msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
@@ -17700,5 +18013,5 @@
 #: build/trans_presets.java:2720
 msgid "Edit Administrative Boundary"
-msgstr "Rediger Fylkesgrense"
+msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
@@ -17710,5 +18023,5 @@
 #: build/trans_presets.java:2726
 msgid "Edit Civil Boundary"
-msgstr "Rediger Kommunegrense"
+msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
@@ -17720,5 +18033,5 @@
 #: build/trans_presets.java:2732
 msgid "Edit Political Boundary"
-msgstr "Rediger Politisk Grense"
+msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
@@ -17730,5 +18043,5 @@
 #: build/trans_presets.java:2738
 msgid "Edit National Park Boundary"
-msgstr "Rediger Nasjonal Park Grense"
+msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
@@ -17747,10 +18060,10 @@
 #: build/trans_presets.java:2748
 msgid "Edit Tree"
-msgstr "Rediger Tre"
+msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
 #: build/trans_presets.java:2753
 msgid "Botanical Name"
-msgstr "Botanisk Navn"
+msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
@@ -17764,5 +18077,5 @@
 #: build/trans_presets.java:2758
 msgid "Edit Wood"
-msgstr "Rediger Skogsområde"
+msgstr "Rediger skogsområde"
 
 #. item "Land use/Wood" combo "Type"
@@ -17789,14 +18102,14 @@
 #: build/trans_presets.java:2766
 msgid "Edit Forest Landuse"
-msgstr "Rediger Skog"
+msgstr "Rediger skog"
 
 #: build/trans_presets.java:2772
 msgid "Nature Reserve"
-msgstr "Natur reservat"
+msgstr "Naturreservat"
 
 #. item
 #: build/trans_presets.java:2773
 msgid "Edit Nature Reserve"
-msgstr "Rediger Naturreservat"
+msgstr "Rediger naturreservat"
 
 #. item "Land use/Nature Reserve" text "Name"
@@ -17809,5 +18122,5 @@
 #: build/trans_presets.java:2779
 msgid "Edit Scree"
-msgstr "Rediger Steinur"
+msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
@@ -17819,5 +18132,5 @@
 #: build/trans_presets.java:2784
 msgid "Edit Scrub"
-msgstr "Rediger Krattskog"
+msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
@@ -17830,5 +18143,5 @@
 #: build/trans_presets.java:2790
 msgid "Edit Fell"
-msgstr "Rediger Fjell"
+msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
@@ -17841,5 +18154,5 @@
 #: build/trans_presets.java:2796
 msgid "Edit Heath"
-msgstr "Rediger Beite"
+msgstr "Rediger beite"
 
 #. item "Land use/Heath" text "Name"
@@ -17854,5 +18167,5 @@
 #: build/trans_presets.java:2804
 msgid "Edit Farmyard Landuse"
-msgstr "Rediger Gårdstun"
+msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
@@ -17864,5 +18177,5 @@
 #: build/trans_presets.java:2810
 msgid "Edit Farmland Landuse"
-msgstr "Rediger Åkerland"
+msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
@@ -17874,5 +18187,5 @@
 #: build/trans_presets.java:2816
 msgid "Edit Meadow Landuse"
-msgstr "Rediger Eng"
+msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
@@ -17884,5 +18197,5 @@
 #: build/trans_presets.java:2822
 msgid "Edit Vineyard Landuse"
-msgstr "Rediger Vingård"
+msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
@@ -17894,5 +18207,5 @@
 #: build/trans_presets.java:2828
 msgid "Edit Allotments Landuse"
-msgstr "Rediger Hageparseller"
+msgstr "Rediger hageparseller"
 
 #. item "Land use/Allotments" text "Name"
@@ -17905,5 +18218,5 @@
 #: build/trans_presets.java:2835
 msgid "Edit Garden"
-msgstr "Rediger Hage"
+msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
@@ -17915,5 +18228,5 @@
 #: build/trans_presets.java:2840
 msgid "Edit Grass Landuse"
-msgstr "Rediger Gress"
+msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
@@ -17926,5 +18239,5 @@
 #: build/trans_presets.java:2847
 msgid "Edit Village Green Landuse"
-msgstr "Rediger Friområde"
+msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
@@ -17937,5 +18250,5 @@
 #: build/trans_presets.java:2854
 msgid "Edit Common"
-msgstr "Rediger Offentlig"
+msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
@@ -17947,5 +18260,5 @@
 #: build/trans_presets.java:2859
 msgid "Edit Park"
-msgstr "Rediger Park"
+msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
@@ -17958,5 +18271,5 @@
 #: build/trans_presets.java:2865
 msgid "Edit Recreation Ground Landuse"
-msgstr "Rediger Friluftsområde"
+msgstr "Rediger friluftsområde"
 
 #. item "Land use/Recreation Ground" text "Name"
@@ -17969,5 +18282,5 @@
 #: build/trans_presets.java:2872
 msgid "Edit Residential Landuse"
-msgstr "Rediger Boligområde"
+msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
@@ -17980,5 +18293,5 @@
 #: build/trans_presets.java:2879
 msgid "Edit Graveyard"
-msgstr "Rediger Gravlund"
+msgstr "Rediger gravlund"
 
 #: build/trans_presets.java:2885
@@ -17990,5 +18303,5 @@
 #: build/trans_presets.java:2887
 msgid "Edit Cemetery Landuse"
-msgstr "Rediger Kirkegård"
+msgstr "Rediger kirkegård"
 
 #: build/trans_presets.java:2894
@@ -17999,5 +18312,5 @@
 #: build/trans_presets.java:2895
 msgid "Edit Retail Landuse"
-msgstr "Rediger Forretninger"
+msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
@@ -18009,5 +18322,5 @@
 #: build/trans_presets.java:2901
 msgid "Edit Commercial Landuse"
-msgstr "Rediger Næringsområde"
+msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
@@ -18019,5 +18332,5 @@
 #: build/trans_presets.java:2907
 msgid "Edit Industrial Landuse"
-msgstr "Rediger Industriområde"
+msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
@@ -18030,5 +18343,5 @@
 #: build/trans_presets.java:2914
 msgid "Edit Railway Landuse"
-msgstr "Rediger Jernbanegrunn"
+msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
@@ -18040,5 +18353,5 @@
 #: build/trans_presets.java:2920
 msgid "Edit Military Landuse"
-msgstr "Rediger Millitært"
+msgstr "Rediger millitært"
 
 #. item "Land use/Military" text "Name"
@@ -18051,5 +18364,5 @@
 #: build/trans_presets.java:2927
 msgid "Edit Construction Landuse"
-msgstr "Rediger Byggeplass"
+msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
@@ -18061,5 +18374,5 @@
 #: build/trans_presets.java:2933
 msgid "Edit Brownfield Landuse"
-msgstr "Rediger Rivningsområde"
+msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
@@ -18071,5 +18384,5 @@
 #: build/trans_presets.java:2939
 msgid "Edit Greenfield Landuse"
-msgstr "Rediger Byggeområde"
+msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
@@ -18081,5 +18394,5 @@
 #: build/trans_presets.java:2945
 msgid "Edit Landfill Landuse"
-msgstr "Rediger Avfallsdeponi"
+msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
@@ -18091,5 +18404,5 @@
 #: build/trans_presets.java:2951
 msgid "Edit Quarry Landuse"
-msgstr "Rediger Steinbrudd"
+msgstr "Rediger steinbrudd"
 
 #. group "Relations"
@@ -18104,5 +18417,5 @@
 #: build/trans_presets.java:2964
 msgid "Edit Multipolygon"
-msgstr "Rediger Multipolygon"
+msgstr "Rediger multipolygon"
 
 #. item "Relations/Multipolygon" text "Name"
@@ -18111,10 +18424,10 @@
 #: build/trans_presets.java:2970
 msgid "outer segment"
-msgstr "ytre linjesegment (outer)"
+msgstr "ytre linjesegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
 #: build/trans_presets.java:2971
 msgid "inner segment"
-msgstr "indre linjesegment (inner)"
+msgstr "indre linjesegment"
 
 #. item "Relations/Multipolygon" role "inner segment"
@@ -18129,5 +18442,5 @@
 #: build/trans_presets.java:2977
 msgid "Edit Turn Restriction"
-msgstr "Rediger Svingeforbud"
+msgstr "Rediger svingeforbud"
 
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
@@ -18140,29 +18453,29 @@
 #: build/trans_presets.java:2979
 msgid "no_left_turn"
-msgstr "venstresving_forbudt"
+msgstr "venstresving forbudt"
 
 #: build/trans_presets.java:2979
 msgid "no_right_turn"
-msgstr "høyresving_forbudt"
+msgstr "høyresving forbudt"
 
 #: build/trans_presets.java:2979
 msgid "no_straight_on"
-msgstr "rett_frem_forbudt"
+msgstr "rett frem forbudt"
 
 #: build/trans_presets.java:2979
 msgid "no_u_turn"
-msgstr "u-sving_forbudt"
+msgstr "u-sving forbudt"
 
 #: build/trans_presets.java:2979
 msgid "only_right_turn"
-msgstr "påbudt_høyre_sving"
+msgstr "påbudt høyresving"
 
 #: build/trans_presets.java:2979
 msgid "only_left_turn"
-msgstr "påbudt_venstre_sving"
+msgstr "påbudt venstresving"
 
 #: build/trans_presets.java:2979
 msgid "only_straight_on"
-msgstr "påbudt_rett_frem"
+msgstr "påbudt rett frem"
 
 #. item "Relations/Turn restriction" text "Name"
@@ -18176,10 +18489,10 @@
 #: build/trans_presets.java:2985
 msgid "via node or way"
-msgstr "via Node eller Linje"
+msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
 #: build/trans_presets.java:2986
 msgid "to way"
-msgstr "til Linje"
+msgstr "til linje"
 
 #. item "Relations/Turn restriction" role "to way"
@@ -18194,5 +18507,5 @@
 #: build/trans_presets.java:2992
 msgid "Edit Route"
-msgstr "Rediger Rute"
+msgstr "Rediger rute"
 
 #. item "Relations/Route" label "Edit Route"
@@ -18200,5 +18513,5 @@
 #: build/trans_presets.java:2994
 msgid "Route type"
-msgstr "Rute type"
+msgstr "Rutetype"
 
 #. item "Relations/Route" combo "Route type"
@@ -18268,8 +18581,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "sykkel"
@@ -18285,5 +18598,5 @@
 #: build/trans_presets.java:2994
 msgid "ferry"
-msgstr "ferrge"
+msgstr "ferge"
 
 #: build/trans_presets.java:2994
@@ -18338,8 +18651,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "fotgjenger"
@@ -18365,5 +18678,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "T-bane"
@@ -18406,5 +18719,5 @@
 #: build/trans_presets.java:3006
 msgid "route segment"
-msgstr "rute segment"
+msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
@@ -18416,5 +18729,5 @@
 #: build/trans_presets.java:3008
 msgid "backward segment"
-msgstr "forrige avsnitt"
+msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
@@ -18493,4 +18806,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18499,4 +18813,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18505,4 +18820,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18511,4 +18827,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18572,7 +18889,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "bro"
@@ -18630,4 +18947,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18753,7 +19071,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18836,15 +19154,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "uønsket"
@@ -18886,5 +19204,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "hest"
@@ -19094,11 +19412,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "hinder"
@@ -19136,6 +19454,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "gate"
@@ -19191,9 +19509,9 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
-msgstr "Riksvei-spor"
+msgstr "ferdselsvei – traktorvei"
 
 #. color foot
@@ -19247,8 +19565,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "jernbane"
@@ -19269,5 +19587,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "service"
@@ -19281,7 +19599,7 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
-msgstr "sperrekjegle"
+msgstr "vadested"
 
 #. color ford
@@ -19300,5 +19618,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "vendesirkel"
@@ -19313,7 +19631,7 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
-msgstr "treffpunkt_for_nødhjelp"
+msgstr "redningsmøtepunkt"
 
 #. color water
@@ -19326,5 +19644,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "elvebredd"
@@ -19338,7 +19656,7 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
-msgstr "elv"
+msgstr "bekk"
 
 #. color water
@@ -19350,5 +19668,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "tørrdokk"
@@ -19376,5 +19694,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "akvadukt"
@@ -19542,13 +19860,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "menneskeskapt"
@@ -19610,7 +19928,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "jernbanepunkt"
@@ -19633,10 +19951,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
-msgstr "annen_bane"
+msgstr "annen bane"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "jernbanebro"
@@ -19656,7 +19974,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19664,10 +19985,14 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
-msgstr "nedlagt_bane"
+msgstr "nedlagt bane"
 
 #. color rail
@@ -19710,6 +20035,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "aeroway"
@@ -19723,5 +20048,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "stasjon"
@@ -19743,5 +20068,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -19755,5 +20080,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -19801,7 +20126,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "aerialway"
@@ -19818,7 +20143,7 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
-msgstr "nedfart_enkel"
+msgstr "nedfart enkel"
 
 #. color piste_easy
@@ -19831,7 +20156,7 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
-msgstr "nedfart_middels"
+msgstr "nedfart middels"
 
 #. color piste_intermediate
@@ -19844,7 +20169,7 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
-msgstr "nedfart_avansert"
+msgstr "nedfart avansert"
 
 #. color piste_advanced
@@ -19857,7 +20182,7 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
-msgstr "nedfart_ekspert"
+msgstr "nedfart ekspert"
 
 #. color piste_expert
@@ -19870,7 +20195,7 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
-msgstr "nedfart_friløp"
+msgstr "nedfart friløp"
 
 #. color piste_freeride
@@ -19883,7 +20208,7 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
-msgstr "nedfart_nybegynner"
+msgstr "nedfart nybegynner"
 
 #. color piste_novice
@@ -19986,10 +20311,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "kraft"
@@ -20003,5 +20328,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "brygge"
@@ -20015,5 +20340,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "rørgate"
@@ -20141,12 +20466,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "fritid"
@@ -20160,5 +20485,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "marina"
@@ -20230,10 +20555,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
-msgstr "bekvemlighet"
+msgstr "fasilitet"
 
 #. color amenity
@@ -20333,12 +20658,12 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
-msgstr "vei_bekvemligheter"
+msgstr "fasilitet – trafikk"
 
 #. color amenity_traffic
@@ -20722,24 +21047,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
-msgstr "bekvemlighet_light"
+msgstr "fasilitet – lys"
 
 #. color amenity_light
@@ -20769,6 +21094,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "light_vann"
@@ -20829,8 +21154,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "helse"
@@ -21183,26 +21508,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "butikk"
@@ -21274,8 +21599,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotell"
@@ -21425,9 +21750,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turisme"
@@ -21499,8 +21824,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "historisk"
@@ -21571,8 +21896,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "grønn"
@@ -21586,5 +21911,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "steinbrudd"
@@ -21598,5 +21923,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -21618,5 +21943,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "vannmagasin"
@@ -21630,5 +21955,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "skog"
@@ -21642,5 +21967,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "gårdstun"
@@ -21663,5 +21988,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "butikker"
@@ -21675,5 +22000,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "industri"
@@ -21687,5 +22012,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -21699,5 +22024,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "byggeområde"
@@ -21711,5 +22036,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -21766,7 +22091,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "millitært"
@@ -21780,5 +22105,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "gravlund"
@@ -21791,5 +22116,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "fjelltopp"
@@ -21804,5 +22129,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "isbre"
@@ -21816,5 +22141,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "vulkan"
@@ -21869,8 +22194,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "natur"
@@ -21884,5 +22209,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "krattskog"
@@ -21896,5 +22221,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "beiteområde"
@@ -21908,5 +22233,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "skogsområde"
@@ -21920,5 +22245,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "søle"
@@ -21932,5 +22257,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "strand"
@@ -22008,8 +22333,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "rute"
@@ -22057,7 +22382,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "grense"
@@ -22199,10 +22524,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "sted"
@@ -22250,6 +22575,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adresse"
@@ -22262,5 +22587,5 @@
 #: build/trans_surveyor.java:6
 msgid "Tunnel Start"
-msgstr "Tunnel Start"
+msgstr "Tunnelstart"
 
 #. <button label="Bridge" hotkey="B" type="toggle">
@@ -22270,5 +22595,5 @@
 #: build/trans_surveyor.java:16
 msgid "Village/City"
-msgstr "Sted/By"
+msgstr "Sted/by"
 
 #. <button label="Parking" hotkey="P" icon="parking">
@@ -22373,5 +22698,5 @@
 #: build/trans_validator.java:38
 msgid "oneway tag on a node"
-msgstr "enveiskjøring egenskap på Node"
+msgstr "enveiskjøring-egenskap på node"
 
 #. node : W : oneway == *
@@ -22389,5 +22714,5 @@
 #: build/trans_validator.java:44
 msgid "wrong highway tag on a node"
-msgstr "feil kjørevei egenskap på node"
+msgstr "feil ferdselsvei-egenskap på node"
 
 #. node : W : highway == track
@@ -22397,10 +22722,10 @@
 #: build/trans_validator.java:47
 msgid "highway without a reference"
-msgstr "vei uten veinummer"
+msgstr "ferdselsvei uten veinummer"
 
 #. way  : I : highway == motorway && nat_ref != *
 #: build/trans_validator.java:48
 msgid "temporary highway type"
-msgstr "midlertidig veitype"
+msgstr "midlertidig ferselsveitype"
 
 #. *    : W : highway == road
@@ -22417,5 +22742,5 @@
 #: build/trans_validator.java:52
 msgid "footway with tag foot"
-msgstr "gangvei med egenskap foot"
+msgstr "gangvei med egenskapen foot"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
@@ -22441,10 +22766,10 @@
 #: build/trans_validator.java:62
 msgid "layer tag with + sign"
-msgstr "navn på lag inneholder + tegn"
+msgstr "navn på lag inneholder +-tegn"
 
 #. *    : W : layer == /\+.*/
 #: build/trans_validator.java:64
 msgid "street name contains ss"
-msgstr "gate navn inneholder ss"
+msgstr "gatenavn inneholder ss"
 
 #. *    : I : name == /.*Strasse.*/i
@@ -22478,81 +22803,164 @@
 #: build/trans_wms.java:5
 msgid "Landsat"
-msgstr "LandSat"
-
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+msgstr "Landsat"
+
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
 msgid "NPE Maps"
-msgstr "NPE kart"
-
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+msgstr "NPE-kart"
+
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
-msgstr "NPE kart (Tim)"
+msgstr "NPE-kart (Tim)"
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "Yahoo (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap-data"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Sykkelvei"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Gater NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
-msgstr ""
-
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+msgstr "Terraserver Topo"
+
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
-msgstr ""
+msgstr "Terraserver Urban"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datalag"
+
+#~ msgid "Change"
+#~ msgstr "Endre"
+
+#~ msgid "Rotate"
+#~ msgstr "Roter"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326 (lengde- og breddegrad)"
 
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har "
-#~ "historikk.."
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
+#~ "Kartprojeksjonen «{0}» er kun laget for\n"
+#~ "nordlige grader mellom 46.1° og 57°.\n"
+#~ "Velg annen kartprojeksjon når du ikke bruker\n"
+#~ "en fransk WMS-tjener.\n"
+#~ "Ikke last opp data etter denne beskjeden."
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "Kartprojeksjonen «{0}» er bare beregnet på\n"
+#~ "breddegrader mellom 45.7° og 47.9°\n"
+#~ "og lengdegrader mellom 5.7° og 10.6°.\n"
+#~ "Benytt en annen kartprojeksjon når du jobber\n"
+#~ "andre steder enn Sveits eller  Lichtenstein.\n"
+#~ "Ikke last opp data etter  denne meldingen."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konflikter: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Innstilling av Objektmaler"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://"
+#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Legg til ny Objektmal instilling i lista."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Kilder for objektmaler"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importer TCX-fil …"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importer TCX fil som GPS spor"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Overlapp kartbilder"
+
+#~ msgid "% of lat:"
+#~ msgstr "% av bredden:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% av lengden:"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Last inn TCX filer direkte fra JOSM."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "Yahoo (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "Yahoo (GNOME-fiks)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "Yahoo (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "Yahoo (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Laster opp data"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Ikke implementert enda."
+
 #~ msgid "Email"
 #~ msgstr "E-post"
@@ -22560,4 +22968,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Løs Konflikter"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
 
 #~ msgid "{0} object has conflicts:"
@@ -22598,4 +23009,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "{0} konflikter må løses i {1} objecter"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Oppfrisk liste - Klikk Reload"
+
+#~ msgid "Revert"
+#~ msgstr "Tilbakestill"
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i "
+#~ "historikk."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22742,4 +23169,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har "
+#~ "historikk.."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -22780,2 +23214,5 @@
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Opplasting av data feilet av ukjent grunn"
+
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 16400)
+++ applications/editors/josm/i18n/po/nl.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-10 15:21+0000\n"
-"Last-Translator: Willem1 <willem.sonke@planet.nl>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-03 21:12+0000\n"
+"Last-Translator: jefjan <jefjan@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:16+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,9 +32,10 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr "De projectie staat niet in de voorkeuren. EPSG:4326 wordt gebruikt."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -42,23 +43,23 @@
 "naar de server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Niet-opgeslagen wijzigingen"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr ""
 "Wijzigingen zijn niet opgeslagen. Deze veranderingen negeren en verder gaan?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Sla op en verlaat JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Negeer veranderingen en verlaat JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -71,12 +72,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -90,7 +91,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -101,32 +102,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ongeldige URL negeren: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ongeldige bestands-URL negeren: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "ONBEKEND"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Over"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Het informatiescherm tonen."
@@ -134,10 +135,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -145,25 +146,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Laatste verandering op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java-versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Beginpagina"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Probleem melden"
@@ -173,5 +175,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -179,27 +181,27 @@
 msgstr "Informatie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Leesmij"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revisie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Bijdrage"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Over JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Bestand kon niet gevonden worden."
@@ -213,12 +215,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Selecteer ten minste één knoop of weg."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -273,5 +274,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Breedtegraad"
@@ -280,5 +281,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Lengtegraad"
@@ -286,5 +287,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Knopen uitlijnen in een cirkel"
@@ -297,5 +298,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -383,7 +384,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Conflicterende relatie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -392,37 +392,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "Laag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflict"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "download"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Inzoomen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Beeld inzoomen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -432,9 +432,9 @@
 msgstr "Beeld: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Geen selectie om op in te zoomen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Geen conflicten om op in te zoomen"
@@ -528,37 +528,41 @@
 msgstr "Selecteer iets om te kopiëren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Cirkel aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Een cirkel uit drie knopen maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Selecteer precies drie knopen of een weg met precies drie knopen."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Deze knopen staan niet in een cirkel."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Selecteer precies drie knopen of een weg met precies drie knopen."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Verwijderen"
@@ -608,5 +612,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -715,11 +719,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -730,5 +735,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Fout"
@@ -738,30 +743,30 @@
 msgstr "Kies een voorgedefineerde licentie"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM Online-hulp"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Openen in browser"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -769,19 +774,19 @@
 msgstr "Herladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Kan alleen hulppagina's van JOSM Online-hulp bewerken"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Fout tijdens het laden van {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -796,18 +801,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Geschiedenis van OSM-wegen of -knopen weergeven."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Elementgeschiedenis"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Geschiedenis van OSM-wegen of -knopen weergeven."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -870,5 +872,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Spiegelen"
@@ -907,10 +909,10 @@
 msgstr "rechts"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "{0} verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -918,5 +920,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Kan objecten niet buiten de wereld plaatsen."
@@ -1110,5 +1112,5 @@
 msgstr "Het bestand {0} bestaat al. Overschrijven?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1118,26 +1120,25 @@
 "dit als fout a.u.b."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Leeg document"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Het document bevat geen gegevens."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Toch opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Conflicten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1147,36 +1148,36 @@
 "niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Conflicten verwerpen en opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "OSM-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "GPX-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Laag opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Kan van bestand geen backup maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Onbekende bestandsextentie."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Het opslaan is mislukt."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Het herstellen van backupbestand is mislukt."
@@ -1228,6 +1229,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Sluiten"
@@ -1300,12 +1302,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Een lidmaatschapsrelatie gebaseerd op een rol is gekopieerd naar alle nieuwe "
-"wegen.\n"
-"Je moet dit controleren en waar nodig corrigeren."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1491,68 +1489,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Naar OSM uploaden..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Upload alle aanpassingen naar de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Objecten om toe te voegen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Objecten om te bewerken:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Objecten om aan te verwijderen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Beschrijf kort de veranderingen die je upload:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Deze veranderingen uploaden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Aanpassingen uploaden"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Niets om te uploaden. Creëer eerst gegevens."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Er zijn nog onopgeloste conflicten, deze dien je eerst op te lossen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Geen aanpassingen aanwezig om te uploaden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1566,17 +1564,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1587,10 +1585,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1600,9 +1598,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1612,18 +1610,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1728,24 +1726,15 @@
 msgstr "Rauwe GPS-gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Gegevens worden gedownload"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Geen gegevens geïmporteerd."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Gegevenslaag {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap-gegevens"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Gegevenslaag"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1787,5 +1776,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1888,5 +1877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren."
@@ -1899,5 +1888,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "De muisknop loslaten om het roteren te stoppen."
@@ -1915,7 +1904,7 @@
 "te spelen; SHIFT+loslaten om het geluid op dat punt te synchroniseren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1923,9 +1912,9 @@
 msgstr "Selecteer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Objecten selecteren, verplaatsen en roteren"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1934,5 +1923,28 @@
 msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Naar links verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Naar links verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Ongedaan maken"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1941,5 +1953,5 @@
 "met dichtstbijzijnde knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1958,5 +1970,5 @@
 msgstr "Zoom en verplaats kaart"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2223,35 +2235,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Toevoegen"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "{0} {1} verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "{0} object wijzigen"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Verwijder \"{0}\" voor {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Stel in {0}={1} voor {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2261,19 +2265,26 @@
 msgstr[1] "objecten"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Verwijder \"{0}\" voor {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Stel in {0}={1} voor {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2281,25 +2292,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "{1} {0} verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "{0} {1} verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Conflicterende relatie"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2310,11 +2321,11 @@
 "Uit relatie verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2325,10 +2336,10 @@
 "Verwijder van relatie?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Wegsegment splitsen"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2340,20 +2351,20 @@
 "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2379,43 +2390,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "Verwijderen uit selectie"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "RemoveRelationMember"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Roteren"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "{0} {1} verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Volgorde"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2514,25 +2531,51 @@
 msgstr "Kan geen voorkeuren van server laden."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "W"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "O"
@@ -2543,5 +2586,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2566,5 +2609,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2663,17 +2706,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2681,16 +2720,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2702,127 +2730,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Oppervlak van weg is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygone weg \"{0}\" is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Lid \"{0}\" in relatie wissen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg \"{0}\" met minder dan twee punten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr "Meer dan een \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "Meer dan een \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Meer dan éé \"via\" gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Onbekende rol \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Onbekend lidtype voor \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Geen \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Geen \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "Geen \"via\"-knoop of -weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stijl voor beperking {0} is niet gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Niet-weg \"{0}\" in multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Geen buitenweg voor multipolygoon \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Binnenweg \"{0}\" is uitwendig."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "niet-getagd"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "tekst"
@@ -2830,5 +2858,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2856,6 +2884,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "achtergrond"
@@ -2865,24 +2893,9 @@
 msgstr "markeren"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"De projectie \"{0}\" is alleen ontwikkeld\n"
-"voor breedtegraden tussen 46.1° and 57°.\n"
-"Gebruik een andere projectie als je geen\n"
-"gebruik maakt van een Franse WMS-server.\n"
-"Upload geen gegevens na deze melding."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2899,36 +2912,24 @@
 "nieuwe zone."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambert-zone (Frankrijk)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-zone (Estland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"De projectie \"{0}\" is alleen ontworpen voor\n"
-"breedtegraden  tussen 45.7° en 47.9°\n"
-"en lengtegraden tussen 5.7° en 10.6°.\n"
-"Gebruik een ander projectie-systeem als u niet werkt met\n"
-"een gegevensverzameling van Zwitserland of Liechtenstein.\n"
-"Upload geen gegevens na dit bericht."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Zwitsers raster (Zwitserland)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "{0} verplaatsen"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2940,14 +2941,14 @@
 msgstr "Kan bladwijzer niet schrijven."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Melding van de dag niet beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- uitgevoerde versie is {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "\"Dagmelding\" downloaden"
@@ -3144,5 +3145,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3204,5 +3204,5 @@
 msgstr "Uitzoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "schalen"
@@ -3236,8 +3236,13 @@
 msgstr "(geen object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "laag niet in lijst."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3245,9 +3250,9 @@
 msgstr "Met OSM-server verbinden..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Probleem tijdens lezen"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Bestand niet gevonden"
@@ -3310,4 +3315,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3317,4 +3323,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "Knopen"
@@ -3322,5 +3330,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Leden"
@@ -3516,7 +3525,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3596,4 +3605,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3601,4 +3613,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3608,4 +3621,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3634,7 +3648,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Verbinding is mislukt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3722,7 +3735,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Voer een naam in voor de locatie."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3755,7 +3767,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
-#, fuzzy
 msgid "Keep my visible state"
-msgstr "Mijn coördinaten houden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
@@ -3765,7 +3776,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Geen datum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3782,7 +3792,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
-#, fuzzy
 msgid "Keep their visible state"
-msgstr "Hun coördinaten houden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
@@ -3798,7 +3807,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "Verwijderen uit selectie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3809,9 +3817,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rol"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3829,4 +3839,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<ongedefinieerd>"
@@ -3850,8 +3862,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3862,7 +3874,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3918,5 +3931,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Opdrachtenlijst"
@@ -3927,6 +3940,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3937,5 +3950,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3944,10 +3957,29 @@
 msgstr "Omschakelen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Opdrachtenlijst: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Conflict"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Samenvoegconflicten."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Oplossen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Een samenvoegingdialoog voor de geselecteerde elementen in bovenstaande "
+"lijst openen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3957,28 +3989,4 @@
 "De geselecteerde elementen op de kaart instellen op de geselecteerde items "
 "in de bovenstaande lijst."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Oplossen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Een samenvoegingdialoog voor de geselecteerde elementen in bovenstaande "
-"lijst openen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Conflict"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Samenvoegconflicten."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Conflicten: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -4015,45 +4023,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Klik Herladen om lijst te verversen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Geschiedenis"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "De geschiedenis van alle geselecteerde items tonen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Object"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Datum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Alle geselecteerde objecten herladen en de lijst verversen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Terugdraaien"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"De staat van alle geselecteerde objecten terugdraaien naar de versie "
-"geselecteerd in de geschiedenislijst."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Nog niet geïmplementeerd."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4186,4 +4197,18 @@
 msgid "Add Properties"
 msgstr "Eigenschappen toevoegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Toevoegen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4296,9 +4321,9 @@
 msgstr "Selectie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Laat paneel drijven"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4307,5 +4332,5 @@
 "werkbalk."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik om de paneelinhoud te verkleinen/vergroten"
@@ -4335,179 +4360,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Wijzigingen toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Basis"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Bezet door"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (lege waarde verwijdert de tag)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Omhoog bewegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "De geselecteerde leden omhoog verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Selectie toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Alle geselecteerde objecten als leden toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Geselecteerde verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Alle nu geselecteerde objecten uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "De geselecteerde bron uit de lijst verwijderen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Omlaag bewegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "De geselecteerde leden omlaag verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Leden downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "nee"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Leden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relatie-editor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Er zijn conflicten tijdens het importeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Ontleden van de serverreactie is mislukt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Kan niet met server verbinden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4542,21 +4490,21 @@
 msgstr "Selecteer eerst een bladwijzer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4566,5 +4514,5 @@
 "downloaden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Omvattend gebied"
@@ -4715,684 +4663,41 @@
 msgstr "Tegelnummers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Afbeeldingen van {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "GPX inlezen..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Geen tijd voor punt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lezen {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Geotagged afbeeldingen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS-start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS-einde: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "Huidige verschil: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "Tijdzoneverschil: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "afbeelding"
-msgstr[1] "afbeeldingen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} binnen de track."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Klok synchroniseren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-afbeeldingen (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Afbeelding"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Syncroniseer tijd met GPS-apparaat"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Ingevoerde tijd kon niet worden ontleed."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "GPS-punt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Lijntekening aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Algemene instellingen gebruiken."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Lijntekenopties selecteren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Kleur aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standaard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Kies een kleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Markers van benoemde punten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Benoemde trackpunten van {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Geluid importeren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-geluidsbestanden (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Geluidsmarkers van {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Afbeeldingen importeren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} track, "
-msgstr[1] "{0} tracks, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} route, "
-msgstr[1] "{0} routes, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Naam: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Beschrijving: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Tijdsperiode: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Lengte: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Naar gegevenslaag omzetten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Onverwerkte GPS-gegevens uploaden als kaartgegevens kan schadelijk "
-"zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Omgezet van: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Uit OSM langs deze track downloaden"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Alles downloaden binnen:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} meters"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Maximum oppervlak per verzoek:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km2"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Deze opdracht heeft {0} losse downloadverzoeken<br>nodig. Wil je "
-"verder<br>gaan?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Sommige waypoints met tijdmarkeringen van vóór de start of na het einde van "
-"de track zijn overgeslagen of naar de start verplaatst."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Enkele waypoints, die te ver van de track liggen om hun tijd zinnig te "
-"kunnen schatten, zijn overgeslagen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "buiten gedownload gebied"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "versie {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} bestaat uit:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} verwijderd.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "API-versie: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Naar GPX-laag omzetten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "track"
-msgstr[1] "tracks"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "Punt"
-msgstr[1] "Punten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "Een track met {0} punt"
-msgstr[1] "Een track met {0} punten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} bestaat uit {1} track"
-msgstr[1] "{0} bestaat uit {1} tracks"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punt"
-msgstr[1] "{0} punten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "GPS-marker"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "marker"
-msgstr[1] "markers"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} bestaat uit {1} marker"
-msgstr[1] "{0} bestaat uit {1} markers"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Geluid synchroniseren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Geluid gesynchroniseerd op punt {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Geluidsmarker op afspeelstart zetten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"Je moet het geluid gepauzeerd hebben op het punt in de track waar je de "
-"marker wilt hebben."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"U moet de afspeelstart nabij de GPX-track slepen waarvan u de gekoppelde "
-"geluidsopname afspeelde (na de eerste marker)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Je moet de afspeelstart slepen (Shift-toets ingedrukt) op de geluidsmarker "
-"of op het trackpunt waar je wilt synchroniseren."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Kan nieuwe geluidsmarker niet aanmaken."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Fout tijdens het tonen van de URL van deze marker"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL was: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Fouten tijden tonen URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Uitgebreide voorkeuren"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Voorkeuren direct instellen. Voorzichtig gebruiken!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Huidige waarde is standaard."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Standaardwaarde is ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Standaardwaarde is onbekend (instelling is nog niet gebruikt)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Selecteer een rij om te bewerken."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Nieuwe waarde voor {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Selecteer een rij om te verwijderen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Nieuw sleutel/waardepaar invoeren"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Het geluidsmenu tonen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Geluids- (en afbeeldings- en web-)markers labelen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Live-geluidsspoor tonen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Niet-geluidsmarkers tijdens lezen GPX aanmaken."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Expliciete waypoints met geldige tijdsaanduiding."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Expliciete waypoints met tijdsschatting uit trackpositie."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Benoemde trackpunten."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Aangepaste tijden (tijdsmarkeringen) van geluidsbestanden."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "De geluidsmenuitem op de hoofdmenubalk tonen of verbergen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Een bewegende pictogram tonen die staat voor het opnamepunt op de "
-"gesynchroniseerde track van het klinkende geluid."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Tekstlabels tegen geluids- (en afbeeldings- en web-)markers plaatsen almede "
-"hun knoppictogrammen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Automatisch een markerlaag voor ieder waypoint maken tijdens het openen van "
-"een GPX-laag."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Bij importeren van geluid, maak markers van..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-"Bij importeren van geluid, pas het toe op ieder waypoint in de GPX-laag."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Van trackpunten automatisch geluidsmarkers maken (in plaats van waypoints) "
-"met namen of beschrijvingen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Geluidsmarkers aanmaken op de positie van de track die overeenkomt met de "
-"aangepast tijd van ieder geïmporteerd WAV-bestand."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Het aantal seconden om vooruit of achteruit te springen als de bijbehorende "
-"knop wordt ingedrukt."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Vooruit-/achteruittijd (seconden)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-"De waarde waarmee de snelheid is vermenigvuldigd voor snel doorspoelen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Versterkingsfactor snel doorspoelen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Afspelen start dit aantal seconden voor (of na, indien negatief) de gewenste "
-"geluidsspoorpositie."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Voorlooptijd (seconden)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-"De verhouding tussen verstreken tijd van de geluidsopname en de werkelijkheid"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Calibratie geluidsopname"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Kleur"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6102,5 +5407,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6251,40 +5557,745 @@
 msgstr "Naam"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Afbeeldingen van {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "GPX inlezen..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Geen tijd voor punt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lezen {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Geotagged afbeeldingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS-start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS-einde: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "Huidige verschil: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "Tijdzoneverschil: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "afbeelding"
+msgstr[1] "afbeeldingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} binnen de track."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Klok synchroniseren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-afbeeldingen (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Afbeelding"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Syncroniseer tijd met GPS-apparaat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Ingevoerde tijd kon niet worden ontleed."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "GPS-punt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Lijntekening aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Algemene instellingen gebruiken."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Lijntekenopties selecteren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Kleur aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standaard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Kies een kleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Markers van benoemde punten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Benoemde trackpunten van {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Geluid importeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-geluidsbestanden (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Geluidsmarkers van {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Afbeeldingen importeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} track, "
+msgstr[1] "{0} tracks, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} route, "
+msgstr[1] "{0} routes, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Naam: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Beschrijving: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Tijdsperiode: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Lengte: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Naar gegevenslaag omzetten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Onverwerkte GPS-gegevens uploaden als kaartgegevens kan schadelijk "
+"zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Omgezet van: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Uit OSM langs deze track downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Alles downloaden binnen:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} meters"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Maximum oppervlak per verzoek:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km2"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Deze opdracht heeft {0} losse downloadverzoeken<br>nodig. Wil je "
+"verder<br>gaan?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Sommige waypoints met tijdmarkeringen van vóór de start of na het einde van "
+"de track zijn overgeslagen of naar de start verplaatst."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Enkele waypoints, die te ver van de track liggen om hun tijd zinnig te "
+"kunnen schatten, zijn overgeslagen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Gegevenslaag {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "buiten gedownload gebied"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "versie {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} bestaat uit:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} verwijderd.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "API-versie: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Naar GPX-laag omzetten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "track"
+msgstr[1] "tracks"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "Punt"
+msgstr[1] "Punten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "Een track met {0} punt"
+msgstr[1] "Een track met {0} punten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} bestaat uit {1} track"
+msgstr[1] "{0} bestaat uit {1} tracks"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punt"
+msgstr[1] "{0} punten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "GPS-marker"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "marker"
+msgstr[1] "markers"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} bestaat uit {1} marker"
+msgstr[1] "{0} bestaat uit {1} markers"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Geluid synchroniseren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Geluid gesynchroniseerd op punt {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Geluidsmarker op afspeelstart zetten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Je moet het geluid gepauzeerd hebben op het punt in de track waar je de "
+"marker wilt hebben."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"U moet de afspeelstart nabij de GPX-track slepen waarvan u de gekoppelde "
+"geluidsopname afspeelde (na de eerste marker)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Je moet de afspeelstart slepen (Shift-toets ingedrukt) op de geluidsmarker "
+"of op het trackpunt waar je wilt synchroniseren."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Kan nieuwe geluidsmarker niet aanmaken."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Fout tijdens het tonen van de URL van deze marker"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL was: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Fouten tijden tonen URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Uitgebreide voorkeuren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Voorkeuren direct instellen. Voorzichtig gebruiken!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Huidige waarde is standaard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Standaardwaarde is ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Standaardwaarde is onbekend (instelling is nog niet gebruikt)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Selecteer een rij om te bewerken."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Nieuwe waarde voor {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Selecteer een rij om te verwijderen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Nieuw sleutel/waardepaar invoeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Het geluidsmenu tonen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Geluids- (en afbeeldings- en web-)markers labelen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Live-geluidsspoor tonen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Niet-geluidsmarkers tijdens lezen GPX aanmaken."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Expliciete waypoints met geldige tijdsaanduiding."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Expliciete waypoints met tijdsschatting uit trackpositie."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Benoemde trackpunten."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Aangepaste tijden (tijdsmarkeringen) van geluidsbestanden."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "De geluidsmenuitem op de hoofdmenubalk tonen of verbergen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Een bewegende pictogram tonen die staat voor het opnamepunt op de "
+"gesynchroniseerde track van het klinkende geluid."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Tekstlabels tegen geluids- (en afbeeldings- en web-)markers plaatsen almede "
+"hun knoppictogrammen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Automatisch een markerlaag voor ieder waypoint maken tijdens het openen van "
+"een GPX-laag."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Bij importeren van geluid, maak markers van..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+"Bij importeren van geluid, pas het toe op ieder waypoint in de GPX-laag."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Van trackpunten automatisch geluidsmarkers maken (in plaats van waypoints) "
+"met namen of beschrijvingen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Geluidsmarkers aanmaken op de positie van de track die overeenkomt met de "
+"aangepast tijd van ieder geïmporteerd WAV-bestand."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Het aantal seconden om vooruit of achteruit te springen als de bijbehorende "
+"knop wordt ingedrukt."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Vooruit-/achteruittijd (seconden)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+"De waarde waarmee de snelheid is vermenigvuldigd voor snel doorspoelen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Versterkingsfactor snel doorspoelen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Afspelen start dit aantal seconden voor (of na, indien negatief) de gewenste "
+"geluidsspoorpositie."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Voorlooptijd (seconden)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+"De verhouding tussen verstreken tijd van de geluidsopname en de werkelijkheid"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Calibratie geluidsopname"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Kleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Tekenstijl {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Laag: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Kies"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Selecteer een kleur voor {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Naar standaardwaarde zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Alles naar standaardwaarde zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Kleuren gebruikt door verschillende objecten in JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Kleuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6293,29 +6304,29 @@
 msgstr "Alles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Geen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forceer lijnen indien er geen segmenten geïmporteerd zijn."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Grote GPS-punten tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Snelheid (rood = langzaam, groen = snel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
@@ -6323,5 +6334,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6342,5 +6353,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6378,5 +6389,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6389,50 +6400,50 @@
 msgstr "Te voet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Teken richting pijlen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Sneltekenen (minder fraai)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Alleen op de kop van een weg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Nummers segmentvolgorde tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Grenzen gedownload gebied tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuele knopen in selectiemodus tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Inactieve lagen in andere kleur tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gladde kaartafbeeldingen (anti-aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6440,9 +6451,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6451,10 +6462,10 @@
 "tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maximum lengte (meters)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6463,10 +6474,10 @@
 "bevatten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6475,5 +6486,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6482,13 +6493,13 @@
 "Geen pijlen tekenen als  ze niet minstens deze afstand hebben tot de vorige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Minimum afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "De GPS-punten groter tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6498,9 +6509,9 @@
 "ingesteld in Laagbeheer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Kleur punten en tracksegmenten op basis van snelheid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6510,28 +6521,28 @@
 "(HDOP). Uw GPS-logger moet deze informatie wel registreren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Staat toe om de kleur van de track te variëren naar gemiddelde snelheden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Track- en puntkleuring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS-punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Richtingwijzers voor wegsegmenten tekenen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -6540,10 +6551,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6551,17 +6562,17 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "De inactieve gegevenslagen in een andere kleur tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM-gegevens"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Backupbestanden behouden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
@@ -6569,82 +6580,103 @@
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Opstartscherm tonen"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Object-id in selectielijsten tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Elastische hulplijn tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Weergave en Vormgeving"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Standaard (automatisch bepaald)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Taal"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Ingebouwde standaarden ingeschakelen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Ingebouwde standaarden ingeschakelen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Soort piste"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Beschikbare plugins configureren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Lijst downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Update"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Sites configureren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Selecteer een invoer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Plugin-site configureren"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Beeldscherminstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6653,81 +6685,81 @@
 "Verschillende instellingen die het uiterlijk van het programma beïnvloeden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Verbindingsinstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Verbindingsinstellingen voor de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Kaartinstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Instellingen voor kaartprojectie en interpretatie van gegevens."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Geluidsinstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Instellingen voor de geluidsspeler en geluidsmarkers."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Coördinaten tonen als"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Projectiemethode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Kaartprojectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Projectiemethode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Coördinaten tonen als"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Proxyserver inschakelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anoniem"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Proxyinstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Proxyserverhost"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Proxyserverpoort"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Gebruikersnaam proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Wachtwoord proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "De basis-URL voor de OSM-server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6735,17 +6767,17 @@
 "Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "URL-basisserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM-wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6760,77 +6792,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Sneltoetsvoorkeuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Sneltoetsen handmatig wijzigen."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Opdracht"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Sneltoets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Beschrijving: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Laag: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Auteurs: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Hulp: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versie {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Standaardwaarde kopiëren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "De rij om te kopiëren selecteren."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Nieuwe bron aan lijst toevoegen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "De geselecteerde bron uit de lijst verwijderen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Voorinstellingenmenu sorteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Ingebouwde standaarden ingeschakelen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Bron tagvoorkeuze"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"De bronnen (URL of bestandsnaam) van bestanden met tagvoorkeuzedefinities. "
-"Zie http://josm.openstreetmap.de/wiki/TaggingPresets voor hulp."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Een nieuwe tagvoorkeuzebron aan de lijst toevoegen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "De geselecteerde bron uit de lijst verwijderen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Tagvoorkeuzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Bronnen tagvoorkeuzen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Werkbalk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Werkbalk aanpassing"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "De elementen op de werkbalk aanpassen."
@@ -7106,6 +7169,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7114,7 +7177,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Het bestand {0} bestaat al. Overschrijven?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7429,5 +7492,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7437,15 +7500,15 @@
 msgstr "{0}% ({1}/{2}), {3} te gaan. Uploading {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Plugins bijwerken"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Plugins downloaden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7458,5 +7521,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7465,23 +7528,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7531,6 +7594,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Plugin uitschakelen"
@@ -7545,5 +7608,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7553,5 +7616,5 @@
 "rechten heeft om de bestaande plugins te overschrijven."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7561,10 +7624,10 @@
 "\"-plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Volgens de informatie in de plugin, is de auteur {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7573,9 +7636,9 @@
 "fout rapporteert."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Moet de plugin worden uitgeschakeld?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7585,5 +7648,5 @@
 "uit de applicatie te halen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7593,19 +7656,19 @@
 "over dit probleem."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Informatie"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "geen omschrijving beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7614,13 +7677,13 @@
 msgstr[1] "Plugin-informatie van {0} sites downloaden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Geen plugin-informatie gevonden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Alle geïnstalleerde plugins zijn bijgewerkt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7633,9 +7696,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Ontbrekende plugins downloaden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7648,6 +7711,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7670,14 +7733,14 @@
 msgstr "onbekend"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: versie {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin gebundeld met JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7935,45 +7998,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-locaties uit EXIF halen"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Mappenscan starten"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Een van de geselecteerde bestanden was leeg!!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Foto's lezen..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kan geen canoniek pad voor map {0} krijgen\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Map {0} scannen"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leeg bestand in {0} gevonden\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Met GPX relateren"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8183,20 +8246,20 @@
 msgstr "Seconden: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "{0} van de {1} foto's komen overeen met GPX-track."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Tijdverschil van {0} dagen)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8204,13 +8267,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Koppelen van foto's aan track is mislukt"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Tijdzone en tijdverschil aanpassen"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Standaardwaarden"
@@ -8232,5 +8295,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
@@ -8586,5 +8649,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Lege laag"
@@ -8689,17 +8752,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Fout in bestandsindeling"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA-import gelukt"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Importeren NMEA is mislukt!"
+msgid "TCX Files (*.tcx)"
+msgstr "GPX-bestanden (*.gpx, *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8724,5 +8789,5 @@
 msgstr "Weg dupliceren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8743,11 +8808,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Pad van GPX-laag importeren"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Bestaand pad laten vallen"
@@ -8756,6 +8821,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Geen GPX-gegevenslaag gevonden."
@@ -8818,6 +8883,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Herteken"
@@ -9126,7 +9191,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "water"
@@ -9470,14 +9535,14 @@
 "Kop bevat meerdere waarden en kan niet in een enkele string worden geplaatst"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugs openen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9610,19 +9675,19 @@
 msgstr "Toegestane opdrachten"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Gewenste details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Wil je dit toestaan?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9747,7 +9812,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Uploaden..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9937,13 +10001,4 @@
 msgstr "U dient eerst bronnen van tagvoorkeuzen in Voorkeuren op te geven."
 
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "TCX-bestand importeren..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "TCX-bestand als GPS-track importeren"
-
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
 msgid "Reverse a terrace"
@@ -9965,5 +10020,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:72
 msgid "Terrace a building"
-msgstr "Gebouw op terras plaatsen"
+msgstr "Rijtjeshuis maken"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:70
@@ -10159,34 +10214,34 @@
 "gesprongen."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Lat/lon invoeren om naar toe te springen."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Je kunt ook een URL van www.openstreetmap.org inplakken."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoom (in metres)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Spring daarheen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Spring naar positie"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 "Kan lengte- of breedtegraad of zoom niet ontleden. Controleer deze s.v.p."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Kan lat/lon niet ontleden."
@@ -10508,24 +10563,24 @@
 "gespeld zijn."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Eigenschapchecker:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 "Deze plugin controleert op fouten in sleutels en waarden van eigenschappen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ongeldige regel tagchecker - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ongeldige regel spellingschecker: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10536,5 +10591,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Ongeldige tag/waarde-combinaties"
@@ -10542,79 +10597,79 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Tekenprobleem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Toets ''{0}'' is ongeldig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Tags met lege waarden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Ongeldige eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Ongeldige spatie in eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Eigenschapwaarde begin of eindigt met een spatie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Eigenschapwaarden bevatten HTML-codes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Sleutel \"{0}\" ontbreekt in voorkeuze."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Voorkeuzen bevatten geen eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuze."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Voorkeuzen bevatten geen eigenschapswaarde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "Herstel-mij's"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Eigenschapsleutels controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Valideer eigenschapsleutels met een woordenlijst"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Uitgebreide eigenschapchecker gebruiken"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valideer eigenschapwaarden en -tags door uitgebreide regels toe te passen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Tagcheckerbron"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10625,74 +10680,84 @@
 "tagchecker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Nieuwe bron aan lijst toevoegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "De geselecteerde bron bewerken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Gegevensbronnen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Eigenschapwaarden controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr "Valideer eigenschapwaarden tegen presets"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Controleer op herstel-mij's."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Knopen of wegen met 'FIXME' in de eigenschapwaarden zoeken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Controleer op tekenknopen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Controleer of kaarttekenen fouten heeft gevonden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Standaardgegevensbestand gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Het standaardgegevensbestand gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Standaardgegevensbestand gebruiken."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Het standaardgegevensbestand gebruiken (aanbevolen)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Standaardbestand spellingscontrole gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Het standaardbestand spellingscontrole gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Eigenschappen herstellen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Kan elementsoort niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Kan waarschuwingsniveau niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ongeldige expressie ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10837,7 +10902,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "gebouw"
@@ -10851,5 +10916,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "gebied"
@@ -10859,9 +10924,9 @@
 msgstr "Niet-gesloten weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Niet-verbonden wegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -10869,17 +10934,17 @@
 "heeft."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Wegeindknoop dicht bij andere snelweg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Wegeindknoop dicht bij andere weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Wegknoop dicht bij andere weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Wegeindknoop dicht bij andere weg verbonden"
@@ -10904,17 +10969,22 @@
 msgstr "Dit test op wegen zonder tag, die leeg zijn of één knoop bevatten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Onbenoemde wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Een splitsing bewerken"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Ongetagde wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Lege wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Éénknoopswegen"
@@ -10952,14 +11022,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Uitzondering opgetreden"
@@ -11057,5 +11127,5 @@
 msgstr "De positie van de geselecteerde WMS-laag aanpassen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11071,15 +11141,15 @@
 msgstr "Automatisch downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11087,103 +11157,92 @@
 "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Een lege WMS-laag openen om gegevens uit een bestand in te laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Voorkeuren WMS-plugin"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+"Lijst met WMS-servers bewerken die in het WMS-pluginmenu worden getoond"
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-"Lijst met WMS-servers bewerken die in het WMS-pluginmenu worden getoond"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Menunaam"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Menunaam (standaard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (standaard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Een menunaam en WMS-URL invoeren"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Standaardwaarde kopiëren"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "De rij om te kopiëren selecteren."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Downloaden"
 
 #. *
@@ -11399,16 +11458,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11417,5 +11471,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11424,5 +11478,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11431,10 +11485,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12231,4 +12285,64 @@
 msgstr "Toegang"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "ja"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12252,5 +12366,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "privé"
@@ -12298,5 +12412,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "bestemming"
@@ -12333,5 +12447,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "toestemming"
@@ -12350,4 +12464,28 @@
 msgid "agricultural"
 msgstr "landbouw"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "nee"
 
 #: build/trans_presets.java:315
@@ -12563,6 +12701,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "Autosnelweg"
@@ -12588,6 +12726,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "autoweg"
@@ -12613,6 +12751,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "provinciale weg"
@@ -12638,6 +12776,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "N-weg"
@@ -12651,5 +12789,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "weg buiten bebouwde kom"
@@ -12667,5 +12805,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "woongebied"
@@ -12683,5 +12821,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "toegangsweg"
@@ -12708,6 +12863,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "werkzaamheden"
@@ -12757,5 +12912,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "rotonde"
@@ -13734,5 +13889,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "moeras"
@@ -15463,27 +15618,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -18321,8 +18476,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "fiets"
@@ -18391,8 +18546,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "voet"
@@ -18418,5 +18573,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metro"
@@ -18546,4 +18701,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18552,4 +18708,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18558,4 +18715,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18564,4 +18722,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18625,7 +18784,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "brug"
@@ -18683,4 +18842,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18806,7 +18966,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18889,15 +19049,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "vervallen"
@@ -18939,5 +19099,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "paard"
@@ -19147,11 +19307,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -19189,6 +19349,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "straat"
@@ -19244,7 +19404,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "snelwegroute"
@@ -19300,8 +19460,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "spoor"
@@ -19322,5 +19482,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19334,5 +19494,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19353,5 +19513,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "Omkeermogelijkheid"
@@ -19366,5 +19526,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19379,5 +19539,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "rivierbank"
@@ -19391,5 +19551,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "stroom"
@@ -19403,5 +19563,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "dok"
@@ -19429,5 +19589,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "aquaduct"
@@ -19595,13 +19755,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "kunstmatig"
@@ -19663,7 +19823,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "spoorwegpunt"
@@ -19686,10 +19846,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "ander spoor"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "spoorovergang"
@@ -19709,7 +19869,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19717,8 +19880,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "oud spoor"
@@ -19763,6 +19930,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "luchtverbinding"
@@ -19776,5 +19943,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminal"
@@ -19796,5 +19963,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "luchtverbinding_donker"
@@ -19808,5 +19975,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "luchtverbinding_licht"
@@ -19854,7 +20021,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "kabelbaan"
@@ -19871,5 +20038,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "piste_eenvoudig"
@@ -19884,5 +20051,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "piste_middelmatig"
@@ -19897,5 +20064,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "piste_gevorderden"
@@ -19910,5 +20077,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19923,5 +20090,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "piste_vrijekuur"
@@ -19936,5 +20103,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "piste_beginner"
@@ -20039,10 +20206,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "kracht"
@@ -20056,5 +20223,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "pijler"
@@ -20068,5 +20235,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "pijplijn"
@@ -20194,12 +20361,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "vrije tijd"
@@ -20213,5 +20380,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "jachthaven"
@@ -20283,8 +20450,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "voorziening"
@@ -20386,10 +20553,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "voorziening_verkeer"
@@ -20775,22 +20942,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "voorziening_licht"
@@ -20822,6 +20989,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "licht_water"
@@ -20882,8 +21049,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "gezondheid"
@@ -21236,26 +21403,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "winkel"
@@ -21327,8 +21494,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotel"
@@ -21478,9 +21645,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "toerisme"
@@ -21552,8 +21719,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "historisch"
@@ -21624,8 +21791,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "groen"
@@ -21639,5 +21806,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "mijnbouw"
@@ -21651,5 +21818,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "vuilstortplaats"
@@ -21671,5 +21838,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "estuarium"
@@ -21683,5 +21850,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "bosbouw"
@@ -21695,5 +21862,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "landbouwgrond"
@@ -21716,5 +21883,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "winkelcentrum"
@@ -21728,5 +21895,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "industrieel"
@@ -21740,5 +21907,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "braakliggend gebied"
@@ -21752,5 +21919,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "ontwikkelingsgebied"
@@ -21764,5 +21931,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "Rangeerterrein"
@@ -21819,7 +21986,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "militair gebruik"
@@ -21833,5 +22000,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "begraafplaats"
@@ -21844,5 +22011,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "berg of -heuveltop"
@@ -21857,5 +22024,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "gletsjer"
@@ -21869,5 +22036,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "vulkaan"
@@ -21922,8 +22089,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "Natuurlijk"
@@ -21937,5 +22104,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "ruig land"
@@ -21949,5 +22116,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "heide"
@@ -21961,5 +22128,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "oerbos"
@@ -21973,5 +22140,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "slikgronden"
@@ -21985,5 +22152,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "strand"
@@ -22061,8 +22228,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "route"
@@ -22110,7 +22277,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "grens"
@@ -22252,10 +22419,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "plaats"
@@ -22303,6 +22470,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adres"
@@ -22533,10 +22700,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Map met luchtfoto's openen"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22544,5 +22711,5 @@
 msgstr "NPE-kaarten"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22550,59 +22717,134 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap-gegevens"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Fietspad"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Straten NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Gegevenslaag"
+
+#~ msgid "Change"
+#~ msgstr "Aanpassen"
+
+#~ msgid "Rotate"
+#~ msgstr "Roteren"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Selecteer a.u.b. minstens één knoop, weg of relatie. Alleen elementen die "
-#~ "reeds geupload zijn hebben een geschiedenis."
+#~ "De projectie \"{0}\" is alleen ontwikkeld\n"
+#~ "voor breedtegraden tussen 46.1° and 57°.\n"
+#~ "Gebruik een andere projectie als je geen\n"
+#~ "gebruik maakt van een Franse WMS-server.\n"
+#~ "Upload geen gegevens na deze melding."
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "De projectie \"{0}\" is alleen ontworpen voor\n"
+#~ "breedtegraden  tussen 45.7° en 47.9°\n"
+#~ "en lengtegraden tussen 5.7° en 10.6°.\n"
+#~ "Gebruik een ander projectie-systeem als u niet werkt met\n"
+#~ "een gegevensverzameling van Zwitserland of Liechtenstein.\n"
+#~ "Upload geen gegevens na dit bericht."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Conflicten: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Bron tagvoorkeuze"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "De bronnen (URL of bestandsnaam) van bestanden met "
+#~ "tagvoorkeuzedefinities. Zie http://josm.openstreetmap.de/wiki/"
+#~ "TaggingPresets voor hulp."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Een nieuwe tagvoorkeuzebron aan de lijst toevoegen."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Bronnen tagvoorkeuzen"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "TCX-bestand importeren..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "TCX-bestand als GPS-track importeren"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Gegevens uploaden"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Nog niet geïmplementeerd."
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -22610,4 +22852,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Conflicten oplossen"
+
+#~ msgid "Object"
+#~ msgstr "Object"
 
 #~ msgid "{0} object has conflicts:"
@@ -22648,4 +22893,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Los {0} conflicten in {1} objecten op"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Klik Herladen om lijst te verversen"
+
+#~ msgid "Revert"
+#~ msgstr "Terugdraaien"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "De staat van alle geselecteerde objecten terugdraaien naar de versie "
+#~ "geselecteerd in de geschiedenislijst."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22807,7 +23068,4 @@
 #~ "Opent het OpenStreetBugs-scherm en activeert de automatische download"
 
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "De projectie staat niet in de voorkeuren. EPSG:4326 wordt gebruikt."
-
 #~ msgid "sports"
 #~ msgstr "Sportartikelen"
@@ -22846,4 +23104,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Selecteer a.u.b. minstens één knoop, weg of relatie. Alleen elementen die "
+#~ "reeds geupload zijn hebben een geschiedenis."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 16400)
+++ applications/editors/josm/i18n/po/pl.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-16 08:17+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-27 15:13+0000\n"
 "Last-Translator: Łukasz Cieśnik <lukasz.ciesnik@gmail.com>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:16+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -23,5 +23,5 @@
 "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -29,6 +29,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -36,31 +36,32 @@
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr "Odwzorowanie nie mogło zostać odczytane z ustawień. Używanie EPSG:4326"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Niezapisane zmiany"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Zmiany nie zostały zapisane. Odrzucić je?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Zapisz i wyjdź"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Porzuć i wyjdź"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -73,12 +74,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -92,7 +93,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -103,32 +104,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL do pliku: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "NIEZNANA"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "O programie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Wyświetla informacje o programie JOSM."
@@ -136,10 +137,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -147,25 +148,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Wersja {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Ostatnia zmiana o {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Wersja Javy {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Raporty o błędach"
@@ -175,5 +177,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -181,27 +183,27 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Plik Readme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Wersja"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Autorzy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "O JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Plik nie został odnaleziony."
@@ -215,12 +217,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Wybierz co najmniej jeden węzeł lub drogę."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Uwaga"
@@ -275,5 +276,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Szerokość"
@@ -282,5 +283,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Długość"
@@ -288,5 +289,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Wyrównaj węzły na kole"
@@ -299,5 +300,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -385,7 +386,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Sprzeczne relacje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -394,37 +394,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "dane"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "warstwa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "pobrany obszar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Pokaż {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Powiększ aby pokazać: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -434,9 +434,9 @@
 msgstr "Widok: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Brak zaznaczenia, które można pokazać"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Brak konfliktów, które można pokazać"
@@ -528,39 +528,43 @@
 msgstr "Proszę wybrać coś do skopiowania."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Utwórz okrąg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 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:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr "Wybrane węzły nie tworzą okręgu."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 "Wybierz proszę dokładnie trzy węzły lub jedną drogę z dokładnie trzema "
 "węzłami."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "Wybrane węzły nie tworzą okręgu."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Usuń"
@@ -612,5 +616,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -719,11 +723,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -734,5 +739,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Błąd"
@@ -742,30 +747,30 @@
 msgstr "Wybierz jedną z gotowych licencji"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "Pomoc JOSM w sieci"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Otwórz w przeglądarce"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Edycja"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -773,19 +778,19 @@
 msgstr "Odśwież"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Strony pomocy można edytować tylko z Pomocy Online JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Błąd w czasie ładowania strony {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -800,18 +805,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Wyświetla historyczne informacje na temat dróg i węzłów OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Historia elementu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Wyświetla historyczne informacje na temat dróg i węzłów OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -872,5 +874,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Odbicie lustrzane"
@@ -909,10 +911,10 @@
 msgstr "w prawo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Przesuń {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -920,5 +922,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Nie można przenieść zaznaczonych obiektów poza świat."
@@ -1115,5 +1117,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1123,26 +1125,25 @@
 "conditions for no layer\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Pusty dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dokument nie zawiera żadnych danych."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Zapisz pomimo tego"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1152,36 +1153,36 @@
 "odrzucone. Czy kontunuować?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Odrzuć konflikty i zapisz"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Zapisz plik OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Zapisz plik GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Zapisz warstwę"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Nie można utworzyć kopii zapasowej pliku."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Nieznane rozszerzenie pliku."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Wystąpił błąd podczas zapisywania."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej."
@@ -1232,6 +1233,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Zamknij"
@@ -1481,68 +1483,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Wyślij do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Wysyła wszystkie zmiany na serwer OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Obiekty do dodania:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Obiekty do zmiany:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Obiekty do usunięcia:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Czy wysłać te zmiany?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Wyślij zmiany"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie ma nic do wysłania. Wprowadź jakieś dane."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Istnieją nierozwiązane konflikty. Musisz je najpierw rozwiązać."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Brak zmian do wysłania."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Wysyłanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1556,17 +1558,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1577,10 +1579,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1590,9 +1592,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1602,18 +1604,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1718,24 +1720,15 @@
 msgstr "czyste dane GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Pobieranie danych"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Nie zaimportowano danych."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Warstwa danych {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "dane OpenSteetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Warstwa danych"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1777,5 +1770,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1878,5 +1871,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -1887,5 +1880,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Zwolnij przycisk myszy aby zakończyć obracanie."
@@ -1901,7 +1894,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1909,9 +1902,9 @@
 msgstr "Zaznacz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Wybieranie, przesuwanie i obracanie obiektów"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1920,5 +1913,28 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Przesuń w lewo"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Przesuń w lewo"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Cofnij"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1927,5 +1943,5 @@
 "najbliższym węzłem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1942,5 +1958,5 @@
 msgstr "Powiększanie i przesuwanie mapy."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2202,35 +2218,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Zmień"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Usuń {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Zmień {0} obiekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Usuń \"{0}\" dla {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Ustaw {0}={1} dla {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2241,19 +2249,26 @@
 msgstr[2] "obiektów"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Usuń \"{0}\" dla {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Ustaw {0}={1} dla {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2261,25 +2276,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Usuń {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Usuń {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Sprzeczne relacje"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2288,11 +2303,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Usuń z relacji"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2301,10 +2316,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Rozdziel segmenty drogi"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2313,20 +2328,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Przenieś"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2353,43 +2368,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
+#, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "usuń z zaznaczenia"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Obrót"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Rotate {0} {1}"
+msgstr "Usuń {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sekwencja"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2487,25 +2508,51 @@
 msgstr "Pobranie preferencji z serwera nie powiodło się."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "W"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "E"
@@ -2516,5 +2563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2539,5 +2586,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2640,17 +2687,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2658,16 +2701,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2679,127 +2711,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Nieznana rola \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgid "No \"from\" way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
-msgid "No \"from\" way found."
+msgid "No \"to\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "nieotagowany"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "tekst"
@@ -2807,5 +2839,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2833,6 +2865,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "tło"
@@ -2842,24 +2874,9 @@
 msgstr "wyróżnienie"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Odwzorowanie \"{0}\" jest zaprojektowany\n"
-"dla szerokości geograficznych między 46.1° a 57°.\n"
-"Proszę użyć innego odwzorowania jeśli\n"
-"nie korzystasz z francuskiego serwera WMS.\n"
-"Proszę nie wysyłać żadnych danych po tej wiadomości."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2870,30 +2887,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "odwzorowanie Lamberta (Francja)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "odwzorowanie Lamberta (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "odwzorowanie Merkatora"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Przesuń {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2905,14 +2916,14 @@
 msgstr "Zapisanie zakładek niemożliwe."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Wiadomość dnia jest niedostępna"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- używasz wersji {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Pobieranie wiadomości dnia"
@@ -3098,5 +3109,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3158,5 +3168,5 @@
 msgstr "Zmniejsz"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skala"
@@ -3190,8 +3200,13 @@
 msgstr "(brak obiektu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "warstwa nie jest na liście."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3199,9 +3214,9 @@
 msgstr "Nawiązywanie połączenia z serwerem OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Błąd podczas przetwarzania"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Plik nie został odnaleziony"
@@ -3261,4 +3276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3268,4 +3284,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3273,5 +3291,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Członkowie"
@@ -3467,7 +3486,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3547,4 +3566,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3552,4 +3574,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3559,4 +3582,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3585,7 +3609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Połączenie nie powiodło się."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3673,7 +3696,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Proszę podać nazwę lokalizacji."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3715,7 +3737,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Brak daty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3747,7 +3768,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "usuń z zaznaczenia"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3758,9 +3778,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rola"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3778,4 +3800,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3799,8 +3823,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3811,7 +3835,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3867,5 +3892,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Historia poleceń"
@@ -3876,6 +3901,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3886,5 +3911,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3893,10 +3918,27 @@
 msgstr "Przełącz: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Historia poleceń: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Rozwiązywanie konflików."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Rozwiąż"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3905,26 +3947,4 @@
 msgstr "Zaznacz na mapie elementy zaznaczone na powyższej liście."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Rozwiąż"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Rozwiązywanie konflików."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konflikty: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -3960,45 +3980,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Kliknij \"Odśwież\" by zaktualizować listę"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Wyświetla historię wszystkich zaznaczonych elementów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Obiekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Data"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Ponownie wczytuje wszystkie zaznaczone obiekty i odświeża listę."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Wycofaj"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w liście "
-"historia poleceń."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Jeszcze nie zaimplementowane."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4133,4 +4156,18 @@
 msgid "Add Properties"
 msgstr "Dodaj właściwości"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Dodaj"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4245,9 +4282,9 @@
 msgstr "Zaznaczenie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Oderwij panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4255,5 +4292,5 @@
 "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela"
@@ -4283,179 +4320,101 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Zastosuj zmiany"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Podstawowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Zajęte przez"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Etykiety (ustawienie wartości na pustą usuwa etykietę)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Przesuń w górę"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Dodaj zaznaczone"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Usuń zaznaczone"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Usuń wszystkie zaznaczone obiekty z relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+msgid "Sort the selected relation members or the whole list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Przesuń w dół"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Pobierz członków"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "tak"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "nie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Członkowie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Edytor relacji: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Wystąpiły konfikty podczas importowania."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Błąd podczas parsowania odpowiedzi serwera."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Nie można połączyć się z serwerem."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4490,21 +4449,21 @@
 msgstr "Wybierz najpierw zakładkę."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min szer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min dł."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max szer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max dł."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4513,5 +4472,5 @@
 "Adres URL z www.openstreetmap.org (można wkleić adres aby pobrać obszar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Wybrany obszar"
@@ -4662,672 +4621,41 @@
 msgstr "Numery kafelków mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Obrazy dla {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Wczytaj GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Brak znacznika czasowego dla punktu {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Wczytywanie {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Geolokalizowane obrazy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS początek: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS koniec: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "aktualne przesunięcie: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "różnica stref czasowych: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "obraz"
-msgstr[1] "obrazy"
-msgstr[2] "obrazów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} wewnątrz ścieżki GPS."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Synchronizuj zegar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "Pliki JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Obraz"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchronizuj czas z urządzeniem GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Podany czas nie został rozpoznany."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "punkt GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Dostosuj rysowanie linii"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Użyj ustawień globalnych."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Wybierz opcje rysowania linii"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Dostosuj kolor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Domyślny"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Wybierz kolor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Znaczniki nazwanych punktów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Nazwane punkty GPS z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importuj dźwięk"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Pliki audio Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Markery audio z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importuj obrazki"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} ślad, "
-msgstr[1] "{0} ślady, "
-msgstr[2] "{0} śladów, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} trasa, "
-msgstr[1] "{0} trasy, "
-msgstr[2] "{0} tras, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkty"
-msgstr[2] "{0} punktów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Nazwa: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Opis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Okres czasu: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Długość: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Przekształć w warstwę danych"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Wysyłanie nieprzetworzonych danych GPS jako danych mapy jest uznawane "
-"za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Przekonwertowany z: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-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:721
-msgid "Download everything within:"
-msgstr "Pobierz wszystko pomiędzy:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metrów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Maksymalny obszar na zapytanie:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km kw."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Ta akcja będzie wymagała {0} osobnych pobrań.<br>Czy kontynuować?</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Nie można znaleźć żadnej ścieżki GPX, którą by można zsynchronizować z "
-"danymi dźwiękowymi."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "poza pobranym obszarem"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "Obiekty na warstwie {0}:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} usuniętych.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "trasa"
-msgstr[1] "trasy"
-msgstr[2] "tras"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punkt"
-msgstr[1] "punkty"
-msgstr[2] "punktów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "trasa z {0} punktem"
-msgstr[1] "trasa z {0} punktami"
-msgstr[2] "trasa z {0} punktami"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} składa się z {1} ścieżki"
-msgstr[1] "{0} składa się z {1} ścieżek"
-msgstr[2] "{0} składa się z {1} ścieżek"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkty"
-msgstr[2] "{0} punktów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "znacznik GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "znacznik"
-msgstr[1] "znaczniki"
-msgstr[2] "znaczników"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} składa się z {1} markera"
-msgstr[1] "{0} składa się z {1} markerów"
-msgstr[2] "{0} składa się z {1} markerów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Synchronizacja dźwięku"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Dźwięk zsynchronizowany w punkcie {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Nie można utworzyć nowego znacznika dźwiękowego."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(Adres URL był: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Błąd podczas wyświetlania adresu"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Ustawienia zaawansowane"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Ustawiona wartość jest wartością domyślną."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Domyślną wartością jest \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Domyślna wartość jest obecnie nieznana (ustawienie nie zostało jeszcze "
-"użyte)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Proszę wybrać wiersz do edycji"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Nowa wartość dla {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Proszę wybrać wiersz do usunięcia"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Podaj nowy klucz i jego wartość"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Wyświetlaj menu \"Audio\""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Nazwane punkty tras."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Czas rozbiegu (w sekundach)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Kalibracja urządzenia nagrywającego"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Kolor"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6037,5 +5365,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6186,40 +5515,733 @@
 msgstr "Nazwa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Obrazy dla {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Wczytaj GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Brak znacznika czasowego dla punktu {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Wczytywanie {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Geolokalizowane obrazy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS początek: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS koniec: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "aktualne przesunięcie: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "różnica stref czasowych: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "obraz"
+msgstr[1] "obrazy"
+msgstr[2] "obrazów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} wewnątrz ścieżki GPS."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Synchronizuj zegar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "Pliki JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Obraz"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchronizuj czas z urządzeniem GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Podany czas nie został rozpoznany."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "punkt GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Dostosuj rysowanie linii"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Użyj ustawień globalnych."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Wybierz opcje rysowania linii"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Dostosuj kolor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Domyślny"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Wybierz kolor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Znaczniki nazwanych punktów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Nazwane punkty GPS z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importuj dźwięk"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Pliki audio Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Markery audio z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importuj obrazki"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} ślad, "
+msgstr[1] "{0} ślady, "
+msgstr[2] "{0} śladów, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} trasa, "
+msgstr[1] "{0} trasy, "
+msgstr[2] "{0} tras, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkty"
+msgstr[2] "{0} punktów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Nazwa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Opis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Okres czasu: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Długość: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Przekształć w warstwę danych"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Wysyłanie nieprzetworzonych danych GPS jako danych mapy jest uznawane "
+"za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Przekonwertowany z: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+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:712
+msgid "Download everything within:"
+msgstr "Pobierz wszystko pomiędzy:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metrów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Maksymalny obszar na zapytanie:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km kw."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Ta akcja będzie wymagała {0} osobnych pobrań.<br>Czy kontynuować?</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+"Nie można znaleźć żadnej ścieżki GPX, którą by można zsynchronizować z "
+"danymi dźwiękowymi."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Warstwa danych {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "poza pobranym obszarem"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "Obiekty na warstwie {0}:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} usuniętych.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "trasa"
+msgstr[1] "trasy"
+msgstr[2] "tras"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punkt"
+msgstr[1] "punkty"
+msgstr[2] "punktów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "trasa z {0} punktem"
+msgstr[1] "trasa z {0} punktami"
+msgstr[2] "trasa z {0} punktami"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} składa się z {1} ścieżki"
+msgstr[1] "{0} składa się z {1} ścieżek"
+msgstr[2] "{0} składa się z {1} ścieżek"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkty"
+msgstr[2] "{0} punktów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "znacznik GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "znacznik"
+msgstr[1] "znaczniki"
+msgstr[2] "znaczników"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} składa się z {1} markera"
+msgstr[1] "{0} składa się z {1} markerów"
+msgstr[2] "{0} składa się z {1} markerów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Synchronizacja dźwięku"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Dźwięk zsynchronizowany w punkcie {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Nie można utworzyć nowego znacznika dźwiękowego."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(Adres URL był: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Błąd podczas wyświetlania adresu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Ustawienia zaawansowane"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Ustawiona wartość jest wartością domyślną."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Domyślną wartością jest \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Domyślna wartość jest obecnie nieznana (ustawienie nie zostało jeszcze "
+"użyte)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Proszę wybrać wiersz do edycji"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Nowa wartość dla {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Proszę wybrać wiersz do usunięcia"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Podaj nowy klucz i jego wartość"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Wyświetlaj menu \"Audio\""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Nazwane punkty tras."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Czas rozbiegu (w sekundach)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Kalibracja urządzenia nagrywającego"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Kolor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Styl rysowania {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Warstwa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Wybierz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Wybierz kolor dla {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Ustaw na domyślne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Domyślne ustawienie dla wszystkich"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Kolory wykorzystywane przez różne obiekty w JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Kolory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6228,29 +6250,29 @@
 msgstr "wszystkie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "pliki lokalne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "żadne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Wymuszaj rysowanie linii jeżeli nie zaimportowano odcinków."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Rysuj duże punkty GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Prędkość (czerwony = wolno, zielony = szybko)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -6258,5 +6280,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6277,5 +6299,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6313,5 +6335,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6324,50 +6346,50 @@
 msgstr "Ruch pieszy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Rysuj strzałki kierunkowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Szybsze rysowanie (wygląda gorzej)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "tylko jeżeli mają znaczenie (np.: dla drogi jednokierunkowej)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Tylko na początku drogi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Numeruj kolejne segmenty dróg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Rysuj granicę obszaru pobranych danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Rysuj węzły wirtualne podczas pracy w trybie zaznaczania"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Zaznaczaj nieaktywne warstwy innym kolorem"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Wygładzaj rysowaną mapę (antyaliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6375,9 +6397,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6386,10 +6408,10 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maksymalna długość (w metrach)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6398,10 +6420,10 @@
 "liniach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Oznaczaj kierunek wszystkich odcinków, łączących punkty GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6410,5 +6432,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6416,13 +6438,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Minimalna odległość (w pikselach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Rysuj większe kropki dla punktów GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6430,9 +6452,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6440,55 +6462,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "Punkty GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rysuje granice obszaru danych pobranych z serwera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "Dane OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Pozostawiaj kopie zapasowe plików"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
@@ -6496,82 +6518,102 @@
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Wyświetlaj ekran powitalny"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Wyświetlaj ID obiektu na listach wyboru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Wygląd i zachowanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Domyślny (ustalony automatycznie)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Język"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+msgid "Enable built-in icon defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Rodzaj trasy"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Konfiguracja dostępnych wtyczek."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Pobierz listę"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr ""
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Ustawienia wyświetlania"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6579,99 +6621,99 @@
 msgstr "Różnorodne ustawienia, które wpływają na wygląd programu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Ustawienia połączenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Ustawienia połączenia z serwerem OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Ustawienia mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Ustawienia odwzorowania kartograficznego oraz interpretacji danych."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Ustawienia audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Ustawienia odtwarzacza audio oraz znaczników audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 "Musisz ponownie uruchomić JOSM aby niektóre ustawienia stały się aktywne."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Wyświetlaj współrzędne jako"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Rodzaj odwzorowania kartograficznego"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Odwzorowanie kartograficzne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Rodzaj odwzorowania kartograficznego"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Wyświetlaj współrzędne jako"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Używaj serwera proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonimowy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Ustawienia Proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Proxy - adres serwera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Proxy - port serwera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Proxy - nazwa użytkownika"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Proxy - hasło"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Adres URL serwera OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Adres URL serwera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "Hasło OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6686,75 +6728,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Skróty klawiaturowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Ręczna zmiana skrótów klawiaturowych."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Akcja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Skrót"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Opis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Warstwa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Autorzy: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Pomoc: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Wersja {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Ustaw na domyślne"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Dodaj nowy węzeł do istniejącej drogi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Sortuj menu szablonów"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Źródło szablonów"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Szablony"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Separator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Pasek narzędzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Dostępne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Personalizacja paska narzędzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Dostosowywanie paska narzędzi do własnych potrzeb."
@@ -7006,6 +7081,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7330,5 +7405,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7338,15 +7413,15 @@
 msgstr "{0}% ({1}/{2}), {3} pozostało. Przesyłanie {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Aktualizuj wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Pobierz wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7358,5 +7433,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7365,23 +7440,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7431,6 +7506,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Zablokuj wtyczkę"
@@ -7445,5 +7520,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7453,5 +7528,5 @@
 "uprawnienia aby nadpisać istniejące pliki."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7461,10 +7536,10 @@
 "\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Zgodnie z informacją zawartą w tej wtyczce jej autorem jest {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7473,9 +7548,9 @@
 "błędu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Czy ta wtyczka ma zostać zablokowana?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7485,5 +7560,5 @@
 "wyładować wtyczkę."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7493,19 +7568,19 @@
 "autorom JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Informacje"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "brak opisu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7515,13 +7590,13 @@
 msgstr[2] "Pobrano informacje o wtyczkach z {0} serwerów"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Nie znaleziono informacji o wtyczce."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Wszystkie zainstalowane wtyczki są aktualne."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7534,9 +7609,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Pobierz brakujące wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7549,6 +7624,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7571,14 +7646,14 @@
 msgstr "nieznany"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Wersja {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Wtyczka dostarczana wraz z JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7837,45 +7912,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Pobieranie lokalizacji GPS z EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Przeglądanie katalogu {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8076,20 +8151,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8097,13 +8172,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8125,5 +8200,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Błąd podczas ładowania pliku"
@@ -8460,5 +8535,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Pusta warstwa"
@@ -8561,17 +8636,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Błędny format pliku"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "Import NMEA zakończony powodzeniem"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Import NMEA zakończony niepowodzeniem!"
+msgid "TCX Files (*.tcx)"
+msgstr "Pliki GPX (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8596,5 +8673,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8615,11 +8692,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8628,6 +8705,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr ""
@@ -8690,6 +8767,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Odświerz"
@@ -8995,7 +9072,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "woda"
@@ -9326,14 +9403,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Aktywne problemy z OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9463,19 +9540,19 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9599,7 +9676,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Wysyłanie..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9787,13 +9863,4 @@
 #: ../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 ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
 msgstr ""
 
@@ -10003,33 +10070,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10340,23 +10407,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10365,5 +10432,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10371,78 +10438,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "DO POPRAWKI"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10450,74 +10517,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+msgid "Use default tag ignore file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+msgid "Use the default tag ignore file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10662,7 +10737,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "budynek"
@@ -10676,5 +10751,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "obszar"
@@ -10684,25 +10759,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Niepołączone drogi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10725,17 +10800,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Drogi bez nazwy"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Edycja skrzyżowania"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Drogi bez tagów"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Puste drogi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Drogi z jednym węzłem"
@@ -10773,14 +10853,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Wystąpił wyjątek"
@@ -10878,5 +10958,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10891,117 +10971,106 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Zmiana rozdzielczości"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+msgid "Load WMS layer from file"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Błędny format pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Ustawienia wtyczki WMS"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Nazwa w menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "Adres serwera WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "URL WMS (domyślny)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Wpisz nazwę pozycji w menu oraz adres serwera WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Pobieranie"
 
 #. *
@@ -11213,16 +11282,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11231,5 +11295,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11238,5 +11302,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11245,10 +11309,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12045,4 +12109,64 @@
 msgstr "Dostęp do drogi"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "tak"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12066,5 +12190,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "droga prywatna"
@@ -12112,5 +12236,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "dojazd do posesji"
@@ -12147,5 +12271,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "dopuszczalny"
@@ -12164,4 +12288,28 @@
 msgid "agricultural"
 msgstr "dla rolnictwa"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "nie"
 
 #: build/trans_presets.java:315
@@ -12377,6 +12525,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "autostrada"
@@ -12402,6 +12550,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "droga ekspresowa"
@@ -12427,6 +12575,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "droga krajowa"
@@ -12452,6 +12600,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "droga wojewódzka"
@@ -12465,5 +12613,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "droga powiatowa"
@@ -12481,5 +12629,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "droga lokalna"
@@ -12497,5 +12645,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "droga serwisowa"
@@ -12522,6 +12687,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "w budowie"
@@ -12571,5 +12736,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "rondo"
@@ -13548,5 +13713,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "marsze"
@@ -15277,27 +15442,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -18135,8 +18300,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr ""
@@ -18205,8 +18370,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr ""
@@ -18232,5 +18397,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metro"
@@ -18360,4 +18525,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18366,4 +18532,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18372,4 +18539,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18378,4 +18546,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18439,7 +18608,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "most"
@@ -18497,4 +18666,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18620,7 +18790,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18703,15 +18873,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "przestarzały"
@@ -18753,5 +18923,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr ""
@@ -18961,11 +19131,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -19003,6 +19173,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "ulica"
@@ -19058,7 +19228,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -19114,8 +19284,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr ""
@@ -19136,5 +19306,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19148,5 +19318,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19167,5 +19337,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr ""
@@ -19180,5 +19350,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19193,5 +19363,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr ""
@@ -19205,5 +19375,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "strumień"
@@ -19217,5 +19387,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "Dok"
@@ -19243,5 +19413,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "akwedukt"
@@ -19409,13 +19579,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr ""
@@ -19477,7 +19647,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19500,10 +19670,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19523,7 +19693,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19531,8 +19704,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19577,6 +19754,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19590,5 +19767,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "Terminal"
@@ -19610,5 +19787,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19622,5 +19799,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19668,7 +19845,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr ""
@@ -19685,5 +19862,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19698,5 +19875,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19711,5 +19888,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19724,5 +19901,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19737,5 +19914,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19750,5 +19927,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -19853,10 +20030,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19870,5 +20047,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr ""
@@ -19882,5 +20059,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr ""
@@ -20008,12 +20185,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr ""
@@ -20027,5 +20204,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "marina"
@@ -20097,8 +20274,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20200,10 +20377,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20589,22 +20766,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20636,6 +20813,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20696,8 +20873,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr ""
@@ -21050,26 +21227,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "sklep"
@@ -21141,8 +21318,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotel"
@@ -21292,9 +21469,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr ""
@@ -21366,8 +21543,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr ""
@@ -21438,8 +21615,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21453,5 +21630,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "kamieniołom"
@@ -21465,5 +21642,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "Wysypisko smieci"
@@ -21485,5 +21662,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "Basen"
@@ -21497,5 +21674,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "las"
@@ -21509,5 +21686,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21530,5 +21707,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr ""
@@ -21542,5 +21719,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "Teren przemysłowy"
@@ -21554,5 +21731,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21566,5 +21743,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21578,5 +21755,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "Teren kolejowy"
@@ -21633,7 +21810,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "Teren wojskowy"
@@ -21647,5 +21824,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "cmentarz"
@@ -21658,5 +21835,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "szczyt"
@@ -21671,5 +21848,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "lodowiec"
@@ -21683,5 +21860,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "wulkan"
@@ -21736,8 +21913,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr ""
@@ -21751,5 +21928,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr ""
@@ -21763,5 +21940,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr ""
@@ -21775,5 +21952,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "Las naturalny"
@@ -21787,5 +21964,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "błoto"
@@ -21799,5 +21976,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "plaża"
@@ -21875,8 +22052,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr ""
@@ -21924,7 +22101,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "granica"
@@ -22066,10 +22243,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "Miejsce"
@@ -22117,6 +22294,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adres"
@@ -22347,10 +22524,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22358,5 +22535,5 @@
 msgstr "Mapy NPE"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22364,59 +22541,96 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "dane OpenSteetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "ścieżka rowerowa"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr ""
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Warstwa danych"
+
+#~ msgid "Change"
+#~ msgstr "Zmień"
+
+#~ msgid "Rotate"
+#~ msgstr "Obrót"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Wybierz co najmniej jeden węzeł, drogę lub relację. Tylko wcześniej "
-#~ "przesłane elementy posiadają historię."
+#~ "Odwzorowanie \"{0}\" jest zaprojektowany\n"
+#~ "dla szerokości geograficznych między 46.1° a 57°.\n"
+#~ "Proszę użyć innego odwzorowania jeśli\n"
+#~ "nie korzystasz z francuskiego serwera WMS.\n"
+#~ "Proszę nie wysyłać żadnych danych po tej wiadomości."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konflikty: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Źródło szablonów"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
 
 #~ msgid "Uploading data"
 #~ msgstr "Przesyłanie danych"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Jeszcze nie zaimplementowane."
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -22424,4 +22638,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Rozwiąż konflikty"
+
+#~ msgid "Object"
+#~ msgstr "Obiekt"
 
 #~ msgid "{0} object has conflicts:"
@@ -22460,4 +22677,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Rozwiąż {0} konfliktów w {1} obiektach"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę"
+
+#~ msgid "Revert"
+#~ msgstr "Wycofaj"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w "
+#~ "liście historia poleceń."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22554,8 +22787,4 @@
 #~ "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych"
 
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "Odwzorowanie nie mogło zostać odczytane z ustawień. Używanie EPSG:4326"
-
 #~ msgid "sports"
 #~ msgstr "Sklep sportowy"
@@ -22566,4 +22795,11 @@
 #~ msgid "Solve Conflict"
 #~ msgstr "Rozwiąż konflikt"
+
+#~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Wybierz co najmniej jeden węzeł, drogę lub relację. Tylko wcześniej "
+#~ "przesłane elementy posiadają historię."
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 16400)
+++ applications/editors/josm/i18n/po/ro.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-19 21:13+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-27 15:09+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:17+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -23,5 +23,5 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -29,6 +29,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -36,9 +36,10 @@
 msgstr "Ajutor"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Proiecţia nu a putut fi citită din preferinţe. Se utilizează Mercator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -46,22 +47,22 @@
 "server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Modificări nesalvate"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Exista modificări nesalvate. Renunţ la modificări şi continui?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Salvez şi Ies"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Renunţ şi Ies"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -74,12 +75,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -93,7 +94,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -104,32 +105,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Se ignoră URL-ul prost format: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Se ingoră fişierul URL prost format: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "NECUNOSCUT"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Despre"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Afişează ecranul cu informaţii despre program."
@@ -137,10 +138,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -148,25 +149,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versiune {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Ultima modificare la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Versiunea Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Pagina pricipală"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Rapoarte erori"
@@ -176,5 +178,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -182,27 +184,27 @@
 msgstr "Informaţii"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Citeşte-mă"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revizia"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Contribuţii"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Module"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Despre JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Fişierul nu a putut fi găsit."
@@ -216,12 +218,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Te rog selectează cel puţin trei noduri."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr ""
@@ -276,5 +277,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Latitudine"
@@ -283,5 +284,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Longitudine"
@@ -289,5 +290,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Aliniază Nodurile în Cerc"
@@ -300,5 +301,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -394,37 +395,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "date"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "strat"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "selecţie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflict"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "descărcare"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Apropie la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Apropie vederea la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -434,9 +435,9 @@
 msgstr "Vedere: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr ""
@@ -526,20 +527,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 
@@ -547,16 +550,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Şterge"
@@ -606,5 +610,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -709,11 +713,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -724,5 +729,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Eroare"
@@ -732,30 +737,30 @@
 msgstr "Alegeţi o licenţă predefinită"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Editare"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -763,19 +768,19 @@
 msgstr "Reîncarcă"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Se pot edita doar paginile din ajutorul JOSM online"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -857,5 +862,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr ""
@@ -894,16 +899,16 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#, java-format
+msgid "Move {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
-msgid "Move {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
-#, java-format
 msgid "Moves Objects {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Nu pot muta obiecte în afara lumii."
@@ -1094,5 +1099,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1100,26 +1105,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Document gol"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Conflicte"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1129,36 +1133,36 @@
 "ca şi cum aţi refuzat totul. Continui?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Extensie fişier necunoscută."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1207,6 +1211,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr ""
@@ -1443,68 +1448,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Despre JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Trimite toate schimbările la serverul OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Obiecte de adăugat:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Obiecte de modificat:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Obiecte de şters:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Nimic de transmis. Mai întâi obţineţi nişte date."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Nu sunt schimbări de transmis."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1518,17 +1523,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1539,10 +1544,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1552,9 +1557,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1564,18 +1569,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1680,24 +1685,15 @@
 msgstr "Date GPS neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Descarc date"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Nu au fost importate date."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Date OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Strat de date"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1739,5 +1735,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1838,5 +1834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -1847,5 +1843,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -1861,7 +1857,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1869,9 +1865,9 @@
 msgstr "Selectaţi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1880,10 +1876,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+msgid "Move elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Mută"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Anulează"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1900,5 +1918,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2156,35 +2174,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Adaugă"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Schimbă"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, java-format
+msgid "Add {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Schimb {0} obiect"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2195,19 +2205,26 @@
 msgstr[2] "de obiecte"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2215,25 +2232,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2242,11 +2259,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2255,10 +2272,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr ""
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2267,20 +2284,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Mută"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2307,9 +2324,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid "removing reference from relation {0}"
-msgstr "elimină din selecţie"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
@@ -2317,33 +2334,39 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#, java-format
+msgid "RemoveRelationMember {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:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2439,25 +2462,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr ""
@@ -2468,5 +2517,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2491,5 +2540,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2589,17 +2638,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2607,16 +2652,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2628,127 +2662,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgid "No \"from\" way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
-msgid "No \"from\" way found."
+msgid "No \"to\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr ""
@@ -2756,5 +2790,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2782,6 +2816,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "fundal"
@@ -2791,19 +2825,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2814,29 +2838,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, java-format
+msgid "UTM Zone {0}"
 msgstr ""
 
@@ -2849,14 +2867,14 @@
 msgstr "Nu am putut scrie semnele de carte."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -3044,5 +3062,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3104,5 +3121,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "scală"
@@ -3136,8 +3153,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "stratul nu este în listă."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3145,9 +3167,9 @@
 msgstr "Contactez serverul OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Eroare la prelucrare"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr ""
@@ -3207,4 +3229,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3214,4 +3237,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3219,5 +3244,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr ""
@@ -3413,7 +3439,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3493,4 +3519,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3498,4 +3527,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3505,4 +3535,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3618,7 +3649,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Vă rog introduceţi un nume pentru locaţie."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3691,7 +3721,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "elimină din selecţie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3702,9 +3731,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3722,4 +3753,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3743,8 +3776,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3755,7 +3788,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3811,5 +3845,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Stivă comenzi"
@@ -3820,6 +3854,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3830,5 +3864,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3837,10 +3871,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Conflict"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Îmbin conflictele."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Rezolvă"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Deschide un dialog de îmbinare a tuturor elementelor selectate din lista de "
+"mai sus."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3850,28 +3903,4 @@
 "Setaţi elementele selectate de pe hartă ca elemente selectate din lista de "
 "mai sus."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Rezolvă"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Deschide un dialog de îmbinare a tuturor elementelor selectate din lista de "
-"mai sus."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Conflict"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Îmbin conflictele."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -3908,45 +3937,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Apăsaţi Reîncarcă pentru a reîmprospăta lista"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Istoric"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Afişează istoricul tuturor elementelor selectate."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Obiect"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Dată"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Anulează"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Readu toate obiectele selectate curent la starea din versiunea selectată în "
-"lista de istoric."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Nu a fost încă implementat."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4080,4 +4112,18 @@
 msgid "Add Properties"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Adaugă"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4190,14 +4236,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -4227,179 +4273,101 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+msgid "Sort"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Şterge sursele selectate din listă."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, java-format
+msgid "Members: {0} (linked: {1})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Au existat conflicte în timpul importului."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4434,21 +4402,21 @@
 msgstr "Selectaţi întâi un semn de carte."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4456,5 +4424,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr ""
@@ -4603,659 +4571,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Imagini pentru {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Nu există timp pentru punctul {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Nu am găsit imagini cu mărci de timp citibile."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Citesc {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Imagini geoetichetate"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Start GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Sfârşit GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "diferentă curentă: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "diferenţă zonă de timp: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "imagine"
-msgstr[1] "imagini"
-msgstr[2] "de imagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} în urmă."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Sincronizare ceas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "Imagine JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Nu există timp EXIF în fişierul \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Imagine"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizare timp cu unitatea GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Timpul introdus nu a putut fi interpretat."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "punct gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Personalizează trasarea liniilor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Utilizează opţiunile globale."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Selectaţi opţiunile pentru trasarea liniilor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Personalizează culoarea"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Implicit"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Alegeţi o culoare"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importă imagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Converteşte la strat de date"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} constă în:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} şters.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "urmă"
-msgstr[1] "urme"
-msgstr[2] "de urme"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punct"
-msgstr[1] "puncte"
-msgstr[2] "de puncte"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "o urmă cu {0} punct"
-msgstr[1] "o urmă cu {0} puncte"
-msgstr[2] "o urmă cu {0} de puncte"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} este format din {1} urmă"
-msgstr[1] "{0} este format din {1} urme"
-msgstr[2] "{0} este format din {1} de urme"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punct"
-msgstr[1] "{0} puncte"
-msgstr[2] "{0} de puncte"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Vă rog selectaţi rândul care va fi editat."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Vă rog selectaţi rândul care va fi şters."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Culoare"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -5965,5 +5315,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6114,40 +5465,720 @@
 msgstr "Nume"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Imagini pentru {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Nu există timp pentru punctul {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Nu am găsit imagini cu mărci de timp citibile."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Citesc {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Imagini geoetichetate"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Start GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Sfârşit GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "diferentă curentă: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "diferenţă zonă de timp: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imagine"
+msgstr[1] "imagini"
+msgstr[2] "de imagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} în urmă."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Sincronizare ceas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "Imagine JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Nu există timp EXIF în fişierul \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Imagine"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizare timp cu unitatea GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Timpul introdus nu a putut fi interpretat."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "punct gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Personalizează trasarea liniilor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Utilizează opţiunile globale."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Selectaţi opţiunile pentru trasarea liniilor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Personalizează culoarea"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Implicit"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Alegeţi o culoare"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importă imagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Converteşte la strat de date"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} constă în:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} şters.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "urmă"
+msgstr[1] "urme"
+msgstr[2] "de urme"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punct"
+msgstr[1] "puncte"
+msgstr[2] "de puncte"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "o urmă cu {0} punct"
+msgstr[1] "o urmă cu {0} puncte"
+msgstr[2] "o urmă cu {0} de puncte"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} este format din {1} urmă"
+msgstr[1] "{0} este format din {1} urme"
+msgstr[2] "{0} este format din {1} de urme"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punct"
+msgstr[1] "{0} puncte"
+msgstr[2] "{0} de puncte"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Vă rog selectaţi rândul care va fi editat."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Vă rog selectaţi rândul care va fi şters."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Culoare"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Alegeţi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Alegeţi o culoare pentru {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Culori utilizate de diferite obiecte în JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Culori"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6156,29 +6187,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forţează linii dacă nu a fost importat nici un segment."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Desenează puncte GPS mari."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -6186,5 +6217,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6205,5 +6236,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6241,5 +6272,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6252,50 +6283,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Desenează săgeţi direcţionale"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6303,19 +6334,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6324,15 +6355,15 @@
 "despre linii."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6340,13 +6371,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Desenează puncte mai pari pentru punctele GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6354,9 +6385,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6364,136 +6395,155 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr ""
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Aspect"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Limbă"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+msgid "Enable built-in icon defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr ""
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Configurări afişare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6503,81 +6553,81 @@
 "program."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Configurări conexiune"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Opţiuni hartă"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Opţiuni pentru proiecţia hărţii şi interpretarea datelor."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
-msgid "Map Projection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
 msgid "Projection method"
 msgstr "Metodă de proiecţie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
+msgid "Map Projection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6586,17 +6636,17 @@
 "nici o parolă."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Adresă server principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "Parola OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6611,75 +6661,107 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr ""
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
-msgid "Sort presets menu"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, java-format
+msgid "Short Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, java-format
+msgid "URL: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Editează: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, java-format
+msgid "Webpage: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versiune {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Implicit"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+msgid "Add a new XML source to the list."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
 msgid "Delete the selected source from the list."
 msgstr "Şterge sursele selectate din listă."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+msgid "Sort presets menu"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr ""
@@ -6930,6 +7012,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7252,5 +7334,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7260,15 +7342,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7278,5 +7360,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7285,23 +7367,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7347,6 +7429,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr ""
@@ -7361,5 +7443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7367,5 +7449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7373,19 +7455,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7393,5 +7475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7399,19 +7481,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7420,13 +7502,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7436,9 +7518,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7448,6 +7530,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7470,14 +7552,14 @@
 msgstr "necunoscut"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7717,45 +7799,45 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7954,20 +8036,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -7975,13 +8057,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8003,5 +8085,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -8335,5 +8417,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr ""
@@ -8447,4 +8529,8 @@
 msgstr ""
 
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
+msgid "TCX Files (*.tcx)"
+msgstr ""
+
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
@@ -8468,5 +8554,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8487,11 +8573,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8500,6 +8586,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr ""
@@ -8562,6 +8648,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr ""
@@ -8867,7 +8953,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr ""
@@ -9196,14 +9282,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+msgid "Open OpenStreetBugs"
+msgstr ""
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-msgid "Open OpenStreetBugs"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9329,19 +9415,19 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9465,7 +9551,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Descarc..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9653,13 +9738,4 @@
 #: ../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 ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
 msgstr ""
 
@@ -9869,33 +9945,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10201,23 +10277,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10226,5 +10302,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10232,78 +10308,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10311,74 +10387,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+msgid "Use default tag ignore file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+msgid "Use the default tag ignore file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10523,7 +10607,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr ""
@@ -10537,5 +10621,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr ""
@@ -10545,25 +10629,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10586,17 +10670,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+msgid "Unnamed Junction"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr ""
@@ -10634,14 +10722,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr ""
@@ -10739,5 +10827,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10750,117 +10838,106 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+msgid "Load WMS layer from file"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "WMS Plugin Preferences"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "WMS Plugin Preferences"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
+msgid "Menu Name"
 msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
-msgid "Menu Name"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+msgid "WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "Menu Name (Default)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "WMS URL (Default)"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
-msgid "WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "Menu Name (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "WMS URL (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "descărcare"
 
 #. *
@@ -11072,16 +11149,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11090,5 +11162,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11097,5 +11169,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11104,10 +11176,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -11904,4 +11976,64 @@
 msgstr ""
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr ""
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -11925,5 +12057,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr ""
@@ -11971,5 +12103,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr ""
@@ -12006,5 +12138,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12022,4 +12154,28 @@
 #: build/trans_presets.java:623
 msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
 msgstr ""
 
@@ -12236,6 +12392,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr ""
@@ -12261,6 +12417,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr ""
@@ -12286,6 +12442,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr ""
@@ -12311,6 +12467,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr ""
@@ -12324,5 +12480,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr ""
@@ -12340,5 +12496,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr ""
@@ -12356,5 +12512,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12381,6 +12554,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr ""
@@ -12430,5 +12603,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr ""
@@ -13407,5 +13580,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr ""
@@ -15136,27 +15309,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr ""
@@ -17994,8 +18167,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr ""
@@ -18064,8 +18237,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr ""
@@ -18091,5 +18264,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr ""
@@ -18219,4 +18392,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18225,4 +18399,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18231,4 +18406,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18237,4 +18413,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18298,7 +18475,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr ""
@@ -18356,4 +18533,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18479,7 +18657,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18562,15 +18740,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr ""
@@ -18612,5 +18790,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr ""
@@ -18820,11 +18998,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -18862,6 +19040,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr ""
@@ -18917,7 +19095,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -18973,8 +19151,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr ""
@@ -18995,5 +19173,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19007,5 +19185,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19026,5 +19204,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr ""
@@ -19039,5 +19217,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19052,5 +19230,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr ""
@@ -19064,5 +19242,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr ""
@@ -19076,5 +19254,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr ""
@@ -19102,5 +19280,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr ""
@@ -19268,13 +19446,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr ""
@@ -19336,7 +19514,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19359,10 +19537,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19382,7 +19560,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19390,8 +19571,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19436,6 +19621,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19449,5 +19634,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr ""
@@ -19469,5 +19654,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19481,5 +19666,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19527,7 +19712,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr ""
@@ -19544,5 +19729,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19557,5 +19742,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19570,5 +19755,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19583,5 +19768,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19596,5 +19781,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19609,5 +19794,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -19712,10 +19897,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19729,5 +19914,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr ""
@@ -19741,5 +19926,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr ""
@@ -19867,12 +20052,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr ""
@@ -19886,5 +20071,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr ""
@@ -19956,8 +20141,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20059,10 +20244,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20448,22 +20633,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20495,6 +20680,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20555,8 +20740,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr ""
@@ -20909,26 +21094,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr ""
@@ -21000,8 +21185,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr ""
@@ -21151,9 +21336,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr ""
@@ -21225,8 +21410,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr ""
@@ -21297,8 +21482,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21312,5 +21497,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr ""
@@ -21324,5 +21509,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr ""
@@ -21344,5 +21529,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr ""
@@ -21356,5 +21541,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr ""
@@ -21368,5 +21553,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21389,5 +21574,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr ""
@@ -21401,5 +21586,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr ""
@@ -21413,5 +21598,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21425,5 +21610,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21437,5 +21622,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21492,7 +21677,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr ""
@@ -21506,5 +21691,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr ""
@@ -21517,5 +21702,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr ""
@@ -21530,5 +21715,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr ""
@@ -21542,5 +21727,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr ""
@@ -21595,8 +21780,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr ""
@@ -21610,5 +21795,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr ""
@@ -21622,5 +21807,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr ""
@@ -21634,5 +21819,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr ""
@@ -21646,5 +21831,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr ""
@@ -21658,5 +21843,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr ""
@@ -21734,8 +21919,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr ""
@@ -21783,7 +21968,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr ""
@@ -21925,10 +22110,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr ""
@@ -21976,6 +22161,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr ""
@@ -22206,10 +22391,10 @@
 msgstr ""
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr ""
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22217,5 +22402,5 @@
 msgstr ""
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22223,52 +22408,61 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr ""
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Date OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr ""
-
-#. yahoo://gnome-web-photo-fixed {0}
+msgid "OpenCycleMap"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr ""
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr ""
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Strat de date"
+
+#~ msgid "Change"
+#~ msgstr "Schimbă"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
 #~ msgid "Uploading data"
 #~ msgstr "Transmit datele"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Nu a fost încă implementat."
+
 #~ msgid "Email"
 #~ msgstr "Email"
@@ -22276,4 +22470,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Rezolvare conflicte"
+
+#~ msgid "Object"
+#~ msgstr "Obiect"
 
 #~ msgid "{0} object has conflicts:"
@@ -22315,2 +22512,18 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Rezolvă {0} conflicte în {1} obiecte"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Apăsaţi Reîncarcă pentru a reîmprospăta lista"
+
+#~ msgid "Revert"
+#~ msgstr "Anulează"
+
+#~ msgid "Date"
+#~ msgstr "Dată"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Readu toate obiectele selectate curent la starea din versiunea selectată "
+#~ "în lista de istoric."
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 16400)
+++ applications/editors/josm/i18n/po/ru.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-26 22:47+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-06 20:56+0000\n"
 "Last-Translator: mulya <rinat.mulyukov@gmail.com>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
@@ -17,10 +17,10 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -28,6 +28,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -35,32 +35,33 @@
 msgstr "Справка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 "Невозможно прочитать вид проекции из настроек. Используется проекция "
 "Меркатора"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Несохранённые изменения"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Присутствуют несохранённые изменения. Сбросить изменения и продолжить?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Сохранить и выйти"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Отменить и выйти"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -73,12 +74,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -92,7 +93,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -103,32 +104,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнорируется неверная ссылка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнорируется неверный адрес файла: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "НЕИЗВЕСТНО"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "О программе"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Отобразить информацию о программе."
@@ -136,10 +137,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -147,25 +148,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Последние изменения: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Версия Java: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Отчёты об ошибках"
@@ -175,5 +177,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -181,27 +183,27 @@
 msgstr "Сведения"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Для прочтения"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Версия"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Авторы"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Модули"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "О программе"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Файл не найден"
@@ -213,14 +215,18 @@
 "OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: неожиданный формат базового URL API. Перенаправление на "
+"страницу истории OSM примитива вероятно не выполнено. Базовый URL API: "
+"''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Пожалуйста, выберите хотябы один узел или путь."
+msgstr ""
+"Пожалуйста, выберите по крайней мере одну уже загруженную точку, линию или "
+"связь."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Предупреждение"
@@ -232,4 +238,6 @@
 "primitives only"
 msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: запуск окон браузера только для первых {0} из {1} выделенных "
+"примитивов"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -275,5 +283,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Широта"
@@ -282,5 +290,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Долгота"
@@ -288,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Выстроить точки окружностью"
@@ -299,5 +307,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -357,18 +365,19 @@
 "{0}, max is {1}"
 msgstr ""
+"Текущее число изменений превысило максимальное, текущее - {0}, максимальное "
+"- {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "Нарушение возможностей API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Не инициализированно"
+msgstr "Сбой инициализации API"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -378,4 +387,6 @@
 "{1}"
 msgstr ""
+"Предупреждение: автоматическое усечение значения  тэга ''{0}'' на удалённом "
+"примитиве {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
@@ -385,48 +396,49 @@
 "length {2}. Values length is {3}."
 msgstr ""
+"Длина значения  'для тега '{0}'' примитива  {1} превышает максимально "
+"допустимую длину {2}. Значение длины {3}."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Нарушение предварительного условия"
+msgstr "Нарушение предусловия"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgstr "{0} точек в линии {1} превышают максимально допустимое число точек {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "данные"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "выделение"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "конфликт"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "скачанное"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Показать {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Изменить масштаб чтобы показать {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -436,9 +448,9 @@
 msgstr "Вид: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Ничего не выделено для показа."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Нет конфликтов чтобы их показать."
@@ -531,39 +543,43 @@
 msgstr "Выделите что-нибудь для копирования."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Создать окружность"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Создать окружность по трём выделенным точкам"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr "Точки не расположены по кругу"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 "Пожалуйста, выберите ровно три точки, или линию, состоящую ровно из трёх "
 "точек."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "Точки не расположены по кругу"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Удалить"
@@ -613,5 +629,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -720,11 +736,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -735,5 +752,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Ошибка"
@@ -743,30 +760,30 @@
 msgstr "Выберите лицензию из набора"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "Online-справка по JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Открыть в браузере"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Правка"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -774,14 +791,14 @@
 msgstr "Обновить"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Возможно только редактирование справочных страниц JOSM Online Help"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Ошибка при загрузке страницы {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
@@ -789,5 +806,5 @@
 "Страница справки отсутствует. Создайте её на <A HREF=\"{0}\">английском</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -804,18 +821,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Открыть в браузере историю изменений выделенного объекта."
+msgstr "Показать информацию истории о OSM линиях, точках или связях."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "История элемента"
+msgstr "Информация об Элементе"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Открыть в браузере историю изменений выделенного объекта."
+msgstr "Показать информацию об объектах о OSM линиях, точках или связях."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -878,5 +892,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Зеркало"
@@ -915,10 +929,10 @@
 msgstr "вправо"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Переместить {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -926,5 +940,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Невозможно переместить объекты за пределы мира."
@@ -1124,5 +1138,5 @@
 msgstr "Файл {0} существует. Перезаписать?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1132,26 +1146,25 @@
 "создайте отчёт об ошибке."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Нет открытых документов. Нечего сохранять."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Пустой документ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "В документе не содержиться данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Сохранить в любом случае"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Конфликты"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1161,36 +1174,36 @@
 "будут обработаны, как будто вы отменили их все. Продолжить?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Отказаться от конфликтов и сохранить"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Сохранить файл OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Сохранить файл GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Сохранить слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Невозможно создать резервную копию."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Неизвестное расширение файла."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "При сохранении возникла ошибка."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "При восстановлении из резервной копии возникла ошибка."
@@ -1243,6 +1256,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Закрыть"
@@ -1320,11 +1334,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Участие в отношениях было применено ко всем новым линиям.\n"
-"Проверьте, и при необходимости внесите корректировки."
+"Отношения членства были скопированы на все новые линии. \n"
+"Вы должны проверить и исправить, если это необходимо."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1504,68 +1517,68 @@
 msgstr "Выборка пуста"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Загрузить на OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Загрузить все изменения на OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Новые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Изменённые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Удаляемые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Опишите изменения для закачиваемых данных:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Загрузить эти изменения?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Загрузить изменения"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Нечего загружать. Сначала создайте данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Нет изменений для загрузки."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Выгрузка"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr "Обновление примитива"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Синхронизированы только {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Синхронизировать весь набор данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1587,17 +1600,17 @@
 "редактирование.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Обнаружен конфликт"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "неожиданное возвращённое значение. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1613,5 +1626,5 @@
 "редактирования.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1620,5 +1633,5 @@
 "\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1631,9 +1644,9 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr "Нарушение предварительного условия"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1646,18 +1659,18 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr "Примитив уже удален"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "Ошибка выгрузки в OSM API"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1764,24 +1777,15 @@
 msgstr "Данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Загрузка данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Данные не импортированы"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Слой данных {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Данные OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Слой данных"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1807,4 +1811,9 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
+"<html>{0} примитив(ов) в вашем наборе данных которые<br>могут быть удалены "
+"на сервере. В дальнейшем, если вы попытаетесь удалить или<br>обновить их, "
+"сервер скорее всего сообщит о<br>конфликте.<br><br>Нажмите <strong>{1}</"
+"strong> что бы проверить состояние этих примитивов<br>на сервере.<br>Нажмите "
+"<strong>{2}</strong> что бы проигнорировать.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
@@ -1823,5 +1832,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1926,5 +1935,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
@@ -1935,5 +1944,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
@@ -1952,7 +1961,7 @@
 "этой точке"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1960,9 +1969,9 @@
 msgstr "Выбор"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Выбирать, двигать и вращать объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1972,5 +1981,28 @@
 msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Переместить влево"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Переместить влево"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Отмена"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1979,5 +2011,5 @@
 "объединения с ближайшей точкой."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1997,5 +2029,5 @@
 msgstr "Изменять масштаб и двигать карту"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2060,5 +2092,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
+msgstr "<b>type=route</b> - ключ 'type' с точным значением 'route'."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
@@ -2067,4 +2099,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
+"<b>type=*</b> - ключ 'type' с любым значением. Также попробуйте <b>*=value</"
+"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
@@ -2267,35 +2301,27 @@
 msgstr "Ошибка  связи с сервером."
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Добавить"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Изменить"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Удалить {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Изменить {0} объект"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Удалить \"{0}\" для {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Установить {0}={1} для {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2306,19 +2332,26 @@
 msgstr[2] "объектов"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Удалить \"{0}\" для {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Установить {0}={1} для {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr "Изменить роль участника отношений"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2326,25 +2359,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+msgstr "не могу устранить нерешенный конфликт"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Удалить {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Удалить {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Конфликтующее отношение"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2355,11 +2388,11 @@
 "Удалить из отношения?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Удалить из связи"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2370,10 +2403,10 @@
 "Удалить из отношения?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Разделить сегмент линии"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2385,20 +2418,20 @@
 "использовать их.<br> Вы действительно хотите удалить их?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "Разрешить конфликт при удалении {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Переместить"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2410,10 +2443,10 @@
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 msgid "Purging 1 primitive"
-msgstr ""
+msgstr "Очистка 1 примитива"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
 #, java-format
 msgid "removing reference from way {0}"
-msgstr ""
+msgstr "удаление ссылки из линии {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
@@ -2423,45 +2456,53 @@
 "{1}"
 msgstr ""
+"Внимание: Удаление линии {0}, так как количество точек стало меньше 2. "
+"Текущее значение {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "Удалить Элементы из Отношений"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "Удалить Участника Отношения"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Вращать"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, 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:72
+#: ../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:69
+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:41
+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:52
+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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2559,25 +2600,51 @@
 msgstr "Невозможно скачать параметры с сервера."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "параметр ''{0}'' не должен быть null"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "Десятичные градусы"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr "Градусы, минуты, секунды"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "Ю"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "З"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "В"
@@ -2586,7 +2653,7 @@
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+msgstr "параметр {0} должен быть > 0. Текущее значение {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2611,5 +2678,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2621,5 +2688,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
 msgid "ways"
-msgstr ""
+msgstr "линии"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
@@ -2640,19 +2707,19 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "changeset"
-msgstr ""
+msgstr "набор изменений"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "changesets"
-msgstr ""
+msgstr "наборы изменений"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-msgstr ""
+msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-msgstr ""
+msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118
@@ -2697,5 +2764,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162
 msgid "There's no version valid at date ''{0}'' in this history"
-msgstr ""
+msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173
@@ -2712,17 +2779,13 @@
 msgstr "более поздняя версия не найдена. История пуста."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr "Примитив  с id {0} не был найден в этом наборе данных"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr "Примитив  с id {0} и версией {1} не был найден в этом наборе данных"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2730,16 +2793,5 @@
 msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr "параметр ''{0}'' не должен быть null"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr "невозможно сравнить примитив с id ''{0}'' и примитив с id ''{1}''"
@@ -2751,127 +2803,127 @@
 msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Путь, обозначающий границу области, не закрыт."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "многополигональная линия ''{0}'' не замкнута"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "В отношении «{0}» имеется член, который был удален."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Путь «{0}» имеет меньше двух точек."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr "Найден больше чем один \"from\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "Найден больше чем один \"to\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Найден больше чем один \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестная роль «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестный тип членства для «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Не найден путь \"from\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Не найден путь \"to\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "Не найдена \"via\" точка или путь"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стиль для ограничения {0} не найден."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Нет полезного значения ''{0}'' для пути ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "не-линия ''{0}'' в мультиполигональном отношении"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Для мультиполигона «{0}» отсутствует внешний путь."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Внутренний путь «{0}» находится снаружи."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стиль для внутренней ''{0}''одинаков с мультиполигоном."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стиль для внешней границы ''{0}'' отсутствует."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "без тэга"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "текст"
@@ -2879,5 +2931,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2886,4 +2938,7 @@
 "Keeping my primitive. "
 msgstr ""
+"Мой примитив с id {0} и версией {1} видим, хотя их примитив с более низкой "
+"версией {2} невидим. Не могут справиться с этой непоследовательности. "
+"Сохраняю мой примитив. "
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -2905,6 +2960,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "фон"
@@ -2914,24 +2969,9 @@
 msgstr "подсветка"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Проекция \"{0}\" разработана только\n"
-"для широт между 46.1° и 57°.\n"
-"Используйте другую проекцию, если не пользуетесь\n"
-"французским сервером WMS. Не загружайте \n"
-"никаких данных на сервер после этого сообщения."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2947,36 +2987,24 @@
 "и начните новый слой в новой зоне."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Зоны Ламберта (Франция)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Зона (Эстония)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Проекция Меркатора"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Проекция \"{0}\" разработана только для\n"
-"широт между 45.7° и 47.9° и долгот между 5.7° и 10.6°.\n"
-"Если Вы не работаете над данными,\n"
-"относящимися к  Швейцарии либо Лихтенштену, \n"
-"воспользуйтесь другой системой проекции .\n"
-"Не делайте выгрузку данных после данного сообщения."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарская проекция"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Переместить {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2988,14 +3016,14 @@
 msgstr "Невозможно записать закладки"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Сообщение дня недоступно"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- сейчас запущена версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Загружается \"Сообщение дня\""
@@ -3190,5 +3218,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3250,5 +3277,5 @@
 msgstr "Уменьшить масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "масштаб"
@@ -3282,8 +3309,13 @@
 msgstr "(нет объекта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "слоя нет в списке."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3291,9 +3323,9 @@
 msgstr "Соединение с OSM сервером..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Ошибка разбора"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Файл не найден"
@@ -3344,5 +3376,5 @@
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
-msgstr ""
+msgstr "роль {0} не участвует в паре сравнения {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
@@ -3353,4 +3385,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3360,4 +3393,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "Точки"
@@ -3365,5 +3400,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Участники"
@@ -3371,5 +3407,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
 msgid "No pending tag conflicts to be resolved"
-msgstr ""
+msgstr "Нет неразрешённых конфликтов тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
@@ -3381,5 +3417,5 @@
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
+msgstr "{0} неразрешённых конфликтов тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
@@ -3391,16 +3427,18 @@
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
+"Сведённый список узлов заморожен. Нет неразрешённых конфликтов в списке "
+"узлов этого пути"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
 msgid "Nodes(with conflicts)"
-msgstr ""
+msgstr "Узлы(с конфликтами)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
 msgid "Pending conflicts in the node list of this way"
-msgstr ""
+msgstr "Неустранённые конфликты в списке узлов этого пути"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
 msgid "Members(resolved)"
-msgstr ""
+msgstr "Члены(разрешённые)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
@@ -3412,9 +3450,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
 msgid "Members(with conflicts)"
-msgstr ""
+msgstr "Участники отношений(с конфликтами)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
 msgid "Pending conflicts in the member list of this relation"
-msgstr ""
+msgstr "Неразрешённые конфликты в списке участников этого отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
@@ -3424,5 +3462,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
 msgid "Properties(with conflicts)"
-msgstr ""
+msgstr "Свойства (с конфликтами)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
@@ -3432,5 +3470,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
 msgid "Conflict Resolution"
-msgstr ""
+msgstr "Разрешение конфликтов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
@@ -3449,10 +3487,10 @@
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
-msgstr ""
+msgstr "недопустимое значение параметра \"index\". Текущее значение {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
-msgstr ""
+msgstr "пункт {0} не найден в списке"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
@@ -3462,14 +3500,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
 msgid "Compare "
-msgstr ""
+msgstr "Сравнить "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
 msgid "My version"
-msgstr ""
+msgstr "Моя версия"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Список элементов в моём наборе данных, то есть локальном наборе данных"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
@@ -3488,5 +3526,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
 msgid "Their version"
-msgstr ""
+msgstr "Их версия"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
@@ -3496,5 +3534,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
 msgid "> top"
-msgstr ""
+msgstr "> наверх"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
@@ -3504,5 +3542,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
 msgid "> bottom"
-msgstr ""
+msgstr "> вниз"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
@@ -3544,22 +3582,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
 msgid "Up"
-msgstr ""
+msgstr "Вверх"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
 msgid "Move up the selected elements by one position"
-msgstr ""
+msgstr "Поднять выделенные элементы на одну позицию"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
 msgid "Down"
-msgstr ""
+msgstr "Вниз"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
 msgid "Move down the selected entries by one position"
-msgstr ""
+msgstr "Опустить выделенные элементы на одну позицию"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3573,5 +3611,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
 msgid "Freeze"
-msgstr ""
+msgstr "Зафиксировать"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
@@ -3639,9 +3677,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
-msgstr ""
+msgstr "параметр '{0}' не должен быть null"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3651,4 +3693,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3657,5 +3700,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
 msgid "Node"
-msgstr ""
+msgstr "Узел"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
@@ -3670,14 +3713,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Ошибка  связи с сервером."
+msgstr ""
+"<html>Произошла ошибка во время соединения с сервером<br>Подробности: {0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Ошибка  связи с сервером."
+msgstr "Связь с сервером прервана"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3736,5 +3780,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
 msgid "Coordinates:"
-msgstr ""
+msgstr "Координаты:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
@@ -3763,17 +3807,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
-#, fuzzy
 msgid "visible (on the server)"
-msgstr "Примитив удаляется на сервере"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
-#, fuzzy
 msgid "not visible (on the server)"
-msgstr "Примитив удаляется на сервере"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Пожалуйста, введите название места."
+msgstr "Оставить клон локальной версии"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3799,5 +3840,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
 msgid "Keep their deleted state"
-msgstr ""
+msgstr "Оставить их состояние \"Удалён\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
@@ -3810,13 +3851,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Да, восстановить их тоже"
+msgstr "Да, сбросить id"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Без даты"
+msgstr "Нет, прервать"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3830,5 +3869,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Сбросить в 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
@@ -3848,7 +3887,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "убрать из выделения"
+msgstr "Удалить из набора данных"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3859,11 +3897,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Роль"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
-msgstr ""
+msgstr "Примитив"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
@@ -3879,6 +3919,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
-msgstr ""
+msgstr "<не определено>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
@@ -3900,8 +3942,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3912,7 +3954,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3942,5 +3985,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
@@ -3968,5 +4011,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Список изменений"
@@ -3977,6 +4020,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3987,5 +4030,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3994,10 +4037,27 @@
 msgstr "Показать/Скрыть: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Стек команд: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Конфликт"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Разрешение конфликтов."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Разрешить"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Открыть диалоговое окно для слияния выбранных объектов."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -4006,26 +4066,4 @@
 msgstr "Выбрать на карте объекты, выбранные в списке вверху."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Разрешить"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Открыть диалоговое окно для слияния выбранных объектов."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Конфликт"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Разрешение конфликтов."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Конфликты: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -4061,44 +4099,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Нажмите \"Обновить\" для обновления списка"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Журнал"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Отобразить журнал по всем выделенным объектам."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Объект"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Дата"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr "Пункт истории"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "Загрузить историю"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr "Загрузка истории для {0} с id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Перегрузить все выбранные объекты, и обновить список."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Откатить"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Откатить состояние выбранных объектов до версии, указанной в списке правок."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Ещё не реализовано."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Показать"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4233,4 +4275,18 @@
 msgid "Add Properties"
 msgstr "Добавить параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Добавить"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4345,9 +4401,9 @@
 msgstr "Выбор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Отсоединить панель"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4356,5 +4412,5 @@
 "панели."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Щёлкните для уменьшения/увеличения содержимого панели"
@@ -4384,179 +4440,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Применить изменения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Основной"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Объект"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "присоединенный"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Тэги (пустое значение удаляет тэг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Переместить вверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Переместить выбранных членов отношения вверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Добавить выбранное"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Сделать все выбранные объекты участниками отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Удалить выбранные"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Удалить все выделенные объекты из связей"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Спорт"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Удалить источник из списка."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Переместить вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Переместить выбранных членов отношения вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Удалить текущего участника из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Скачать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Скачать недостающие части линий и узлов, участвующих в отношении"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "да"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "нет"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Участники: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Редактор отношений: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "При импортировании возникли конфликтные ситуации."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Ошибка при разборе ответа от сервера."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Невозможно связаться с сервером."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4591,21 +4570,21 @@
 msgstr "Сначала выберите закладку."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "мин. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "мин. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "макс. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "макс. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4615,5 +4594,5 @@
 "область)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Рамка"
@@ -4764,696 +4743,41 @@
 msgstr "Номера квадратов"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Изображения для {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Прочесть GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Нет указания времени для точки {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Невозможно прочесть время \"{0}\" у точки  {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Не найдено изображений с информацией о времени."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Чтение {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Изображения с данными о местоположении"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Начало GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Конец GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "текущая разница: {0} с."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "разница в часовых поясах: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "изображение"
-msgstr[1] "изображения"
-msgstr[2] "изображений"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} в пределах трека"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Синхронизация часов"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "Изображения JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Невозможно прочесть дату из файла \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "EXIF файла \"{0}\" не содержит информации о времени."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Изображение"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Часовой пояс GPS объекта (отличается от фотографии)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Синхронизировать время с GPS приёмником"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Введённое время невозможно использовать"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "точка GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Настроить отрисовку линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Использовать глобальные настройки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "Отображать линии между точками для этого слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr "Не отображать линии между точками для этого слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Выбрать варианты отрисовки линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Выбрать цвет"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "По умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Выбор цвета"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Маркеры из именованых точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Назвать маршрутные точки из {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Импортировать аудиофайлы"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Аудиофайлы Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Аудиомаркеры из {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Импорт изображений"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} дорожка, "
-msgstr[1] "{0} дорожки, "
-msgstr[2] "{0} дорожек, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} маршрут, "
-msgstr[1] "{0} маршрута, "
-msgstr[2] "{0} маршрутов, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} путевая точка"
-msgstr[1] "{0} путевые точки"
-msgstr[2] "{0} путевых точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Название: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Описание: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Временной интервал: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Длина: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Преобразовать в слой данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Загрузка на карту необработанных данных GPS считается вредоносной."
-"<br>Если хотите загрузить трэк, сделайте это по ссылке:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Преобразовано из: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Скачать с JSM данные вдоль трэка"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Скачать всё в пределах:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} метров"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Максимальная область для одного запроса:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} кв. км."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Это действие потребует {0} отдельных<br>запросов на скачивание. "
-"Продолжить?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Некоторые маршрутные точки созданы до начала трека или после его окончания и "
-"будут пропущены или перенесены в начало трека."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Нектоторые точки, которые были слишком далеко от остальных, чтобы рассчитать "
-"их время, были проигнорированы."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "вне области для скачивания"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "версия {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} состоит из:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} удалено)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "отключено"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "Версия API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Преобразовать в слой GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "трек"
-msgstr[1] "треки"
-msgstr[2] "треков"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "точка"
-msgstr[1] "точки"
-msgstr[2] "точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "трек с {0} точкой"
-msgstr[1] "трек с {0} точками"
-msgstr[2] "трек с {0} точками"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} состоит из {1} трека"
-msgstr[1] "{0} состоит из {1} треков"
-msgstr[2] "{0} состоит из {1} треков"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} точка"
-msgstr[1] "{0} точки"
-msgstr[2] "{0} точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "маркер GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "маркер"
-msgstr[1] "маркера"
-msgstr[2] "маркеров"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} состоит из {1} маркера"
-msgstr[1] "{0} состоит из {1} маркеров"
-msgstr[2] "{0} состоит из {1} маркеров"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Синхронизировать аудио"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Аудио синхронизировано на точке {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr "Невозможно синхронизировать слой который используется"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Установить маркер аудио на позиции проигрывания"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"Вы должны поставить аудио на паузу в той точке пути, где хотите поставить "
-"маркер."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Нет существующих аудио маркеров на этом слое"
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"Вам необходимо перетащить значёк играющей головы рядом с от GPX трэком с "
-"которым связана звуковая дорожка (после первого маркера)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Нужно удерживать Shift и перетащить значек играющей головы на аудио маркера "
-"или на точку трека, где вы хотите синхронизировать."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Невозможно создать новый аудио-маркер."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Произошла ошибка при попытке показать URL для этого маркера"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(по ссылке: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Невозможно отобразить URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Дополнительные параметры"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Установка параметров напрямую. Пользоваться с осторожностью!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Поиск: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Текущее значение - по умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Текущее значение - ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Пожалуйста, выберите ряд для редактирования."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Новое значение для {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Пожалуйста, выберите ряд для удаления."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Введите новый ключ и значение"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Показать меню Аудио."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Подписывать маркеры аудио, картинок и веба."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Показать звуковые подсказки в реальном времени"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Создать не звуковые маркеры при обработке GPX данных"
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Точные маршрутные точки с правильными временными метками"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Точные маршрутные точки с приблизительным временем из позиции на треке"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Именованые точки пути."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Изменить время (метку времени) звукового файла"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "Начать трек (всегда делать это, если другие метки недоступны)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Отобразить или спрятать меню работы со звуком на панели Главного меню"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Показать анимированную иконку в точке трека, где был записан проигрываемый в "
-"данный момент звук."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Поставьте текстовую надпись напротив аудио (и изображения и веб-сайта) "
-"маркеров, а также их кнопок."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Автоматически создавать слой меток из маршрутных точек при открытии GPX слоя"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Когда импортируется звук, применять метки из..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-"Когда импортируется звук, применять его для любых маршрутных точек из слоя "
-"GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Автоматически создавать звуковые метки из узлов трека (вместо точных "
-"маршрутных точек) с именами или описаниями"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Создать звуковые метки в положении на треке, соответствующем времени "
-"изменения каждого импортированного звукового файла WAV."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Показывает, на сколько секунд вперёд или назад нужно перейти при нажатии "
-"соответствующей кнопки"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Время перемотки (секунд)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-"Показывает, во сколько раз увеличивается скорость при быстром проигрывании"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Множитель быстрого проигрывания"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Воспроизведение начнется через это количество секунд до (или после, в случае "
-"отрицательного) звуковой дорожки у запрошенной позиции"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Продолжительность вступления (в секундах)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-"Соотношение времени диктофонной записи соответствует прошедшему времени"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Калибровка звукозаписи"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Цвет"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "История для {0}{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "Закрыть диалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Узел {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6163,5 +5487,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6312,40 +5637,757 @@
 msgstr "Название"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Версия"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Изображения для {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Прочесть GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Нет указания времени для точки {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Невозможно прочесть время \"{0}\" у точки  {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Не найдено изображений с информацией о времени."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Чтение {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Изображения с данными о местоположении"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Начало GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Конец GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "текущая разница: {0} с."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "разница в часовых поясах: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "изображение"
+msgstr[1] "изображения"
+msgstr[2] "изображений"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} в пределах трека"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Синхронизация часов"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "Изображения JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Невозможно прочесть дату из файла \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "EXIF файла \"{0}\" не содержит информации о времени."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Изображение"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Часовой пояс GPS объекта (отличается от фотографии)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Синхронизировать время с GPS приёмником"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Введённое время невозможно использовать"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "точка GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Настроить отрисовку линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Использовать глобальные настройки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "Отображать линии между точками для этого слоя."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr "Не отображать линии между точками для этого слоя."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Выбрать варианты отрисовки линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Выбрать цвет"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Выбор цвета"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Маркеры из именованых точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Назвать маршрутные точки из {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Импортировать аудиофайлы"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Аудиофайлы Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудиомаркеры из {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Импорт изображений"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} дорожка, "
+msgstr[1] "{0} дорожки, "
+msgstr[2] "{0} дорожек, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} маршрут, "
+msgstr[1] "{0} маршрута, "
+msgstr[2] "{0} маршрутов, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} путевая точка"
+msgstr[1] "{0} путевые точки"
+msgstr[2] "{0} путевых точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Название: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Временной интервал: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Длина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Преобразовать в слой данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Загрузка на карту необработанных данных GPS считается вредоносной."
+"<br>Если хотите загрузить трэк, сделайте это по ссылке:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Преобразовано из: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Скачать с JSM данные вдоль трэка"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Скачать всё в пределах:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} метров"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Максимальная область для одного запроса:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} кв. км."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Это действие потребует {0} отдельных<br>запросов на скачивание. "
+"Продолжить?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Некоторые маршрутные точки созданы до начала трека или после его окончания и "
+"будут пропущены или перенесены в начало трека."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Нектоторые точки, которые были слишком далеко от остальных, чтобы рассчитать "
+"их время, были проигнорированы."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Слой данных {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "вне области для скачивания"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} состоит из:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} удалено)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "отключено"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "Версия API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Преобразовать в слой GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "трек"
+msgstr[1] "треки"
+msgstr[2] "треков"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "точка"
+msgstr[1] "точки"
+msgstr[2] "точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "трек с {0} точкой"
+msgstr[1] "трек с {0} точками"
+msgstr[2] "трек с {0} точками"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} состоит из {1} трека"
+msgstr[1] "{0} состоит из {1} треков"
+msgstr[2] "{0} состоит из {1} треков"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} точка"
+msgstr[1] "{0} точки"
+msgstr[2] "{0} точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "маркер GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "маркер"
+msgstr[1] "маркера"
+msgstr[2] "маркеров"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} состоит из {1} маркера"
+msgstr[1] "{0} состоит из {1} маркеров"
+msgstr[2] "{0} состоит из {1} маркеров"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Синхронизировать аудио"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Аудио синхронизировано на точке {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr "Невозможно синхронизировать слой который используется"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Установить маркер аудио на позиции проигрывания"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Вы должны поставить аудио на паузу в той точке пути, где хотите поставить "
+"маркер."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Нет существующих аудио маркеров на этом слое"
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Вам необходимо перетащить значёк играющей головы рядом с от GPX трэком с "
+"которым связана звуковая дорожка (после первого маркера)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Нужно удерживать Shift и перетащить значек играющей головы на аудио маркера "
+"или на точку трека, где вы хотите синхронизировать."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Невозможно создать новый аудио-маркер."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Произошла ошибка при попытке показать URL для этого маркера"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(по ссылке: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Невозможно отобразить URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Дополнительные параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Установка параметров напрямую. Пользоваться с осторожностью!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Поиск: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Текущее значение - по умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Текущее значение - ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Пожалуйста, выберите ряд для редактирования."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Новое значение для {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Пожалуйста, выберите ряд для удаления."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Введите новый ключ и значение"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Показать меню Аудио."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Подписывать маркеры аудио, картинок и веба."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Показать звуковые подсказки в реальном времени"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Создать не звуковые маркеры при обработке GPX данных"
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Точные маршрутные точки с правильными временными метками"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Точные маршрутные точки с приблизительным временем из позиции на треке"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Именованые точки пути."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Изменить время (метку времени) звукового файла"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "Начать трек (всегда делать это, если другие метки недоступны)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Отобразить или спрятать меню работы со звуком на панели Главного меню"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Показать анимированную иконку в точке трека, где был записан проигрываемый в "
+"данный момент звук."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Поставьте текстовую надпись напротив аудио (и изображения и веб-сайта) "
+"маркеров, а также их кнопок."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Автоматически создавать слой меток из маршрутных точек при открытии GPX слоя"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Когда импортируется звук, применять метки из..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+"Когда импортируется звук, применять его для любых маршрутных точек из слоя "
+"GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Автоматически создавать звуковые метки из узлов трека (вместо точных "
+"маршрутных точек) с именами или описаниями"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Создать звуковые метки в положении на треке, соответствующем времени "
+"изменения каждого импортированного звукового файла WAV."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Показывает, на сколько секунд вперёд или назад нужно перейти при нажатии "
+"соответствующей кнопки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Время перемотки (секунд)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+"Показывает, во сколько раз увеличивается скорость при быстром проигрывании"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Множитель быстрого проигрывания"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Воспроизведение начнется через это количество секунд до (или после, в случае "
+"отрицательного) звуковой дорожки у запрошенной позиции"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Продолжительность вступления (в секундах)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+"Соотношение времени диктофонной записи соответствует прошедшему времени"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Калибровка звукозаписи"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Цвет"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Стиль точки {0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Слой: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Выбрать"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Выберите цвет для {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Задать в значение по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Задать все значения по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Цвета, используемые разными объектами в JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6354,25 +6396,25 @@
 msgstr "Все"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Локальные файлы"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Нет"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Отображать линии, даже если не импортировано сегментов."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Отображать крупные точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорость (красный = медленно, зелёный = быстро)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -6380,5 +6422,5 @@
 "имеются)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним цетом (может быть определено для именованных слоев"
@@ -6386,5 +6428,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6405,5 +6447,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6441,5 +6483,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6452,16 +6494,16 @@
 msgstr "Пешком"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Отображать стрелки направления"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Быстрая отрисовка (выглядит хуже)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -6470,34 +6512,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Только в начале пути"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Отображать порядковые номера сегментов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Отображать границы скачанных данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Отображать виртуальные точки в режиме выделения"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Отображать неактивные слои другим цветом"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Сглаженные линии (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Рисовать линии между точками GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6507,9 +6549,9 @@
 "чтобы рисовать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальная длина для локальных файлов (в метрах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6518,20 +6560,20 @@
 "чтобы отображать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Максимальная длина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Отображать линии, даже если не импортировано информации о линиях."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Отображать стрелки на линиях, соединяющих точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6540,5 +6582,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6547,13 +6589,13 @@
 "Не изображать стрелки, если их нет на этом расстоянии от последних стрелок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Минимальное расстояние (в пикселях)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Отображать точки GPS более жирно"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6563,9 +6605,9 @@
 "Менеджере Слоев."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Цвета точек и сегментов треков по скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6575,54 +6617,54 @@
 "(HDOP). Ваше устройство должно журналировать эту информацию."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Позволяет настраивать окраску трека для различных средних скоростей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Разцветить трэки и точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Показывать направление на сегментах путей."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показывать порядковые номера на всех сегментах пути."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Применить сглаживание карты."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Отображать границы области, скачанной с сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Отображать неактивные слои данных другим цветом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "Данные OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Сохранять резервные копии"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
@@ -6631,82 +6673,103 @@
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Показывать заставку при запуске"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Показывать ID объектов в списке выбора"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Рисовать «резиновую» вспомогательную линию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Безрежимная работа (в стиле Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Не требует переключения режимов (рабочий стиль potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Оформление"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "По умолчанию (Автоопределение)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Язык"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Использовать настройки по умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Использовать настройки по умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Тип лыжня"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Настроить доступные модули."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Скачать список"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Обновить"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Настроить сайты..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Пожалуйста, выберите запись."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Настроить сайты с модулями"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Настройки экрана"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6714,98 +6777,98 @@
 msgstr "Различные настройки, влияющие на внешний вид программы."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Параметры соединения"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Параметры соединения с сервером OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Настройки карты"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Параметры проекции карты и отображения данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Параметры Аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Параметры звукового проигрывателя, и звуковых маркеров."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Отображать координаты как"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Тип проекции"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Картографическая проекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Тип проекции"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Отображать координаты как"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Использовать прокси-сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Анонимный"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Параметры прокси-сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Адрес"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Порт"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Имя пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Основной адрес сервера OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Основной адрес сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6813,4 +6876,7 @@
 "URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
+"<html>ВНИМАНИЕ: Пароль хранится открытым текстом в файле настроек.<br>Пароль "
+"передаётся на сервер открытым текстом составной частью URL.<br><b>Не "
+"используйте ценные Пароли.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6820,77 +6886,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Настройки клавиш"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Изменить сочетания клавиш вручную"
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Действие"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Горячая клвиша"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Слой: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Авторы: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Справка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Копия поумолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Пожалуйста, выберите ряд для копирования."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Добавить в список новый источник."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Удалить источник из списка."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Сортировать меню предустановок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Использовать настройки по умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Источник предустановок тегов"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Источник (URL или имя файла) файла с предустановками тегов. См. http://josm."
-"openstreetmap.de/wiki/TaggingPresets для большей информации."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Добавить новый источник предустановки тегов в список."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Удалить источник из списка."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Предустановки тегов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Источники предустановок тегов"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Разделитель"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Панель инструментов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Доступно"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Настройка панели инструментов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Настроить элементы панели инструментов."
@@ -7163,6 +7260,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7171,7 +7268,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Файл {0} существует. Перезаписать?"
+msgstr "Файл \"{0}\" не существует"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7333,5 +7430,5 @@
 #, java-format
 msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
+msgstr "обязательный атрибут ''{0}'' отсутствует"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
@@ -7339,4 +7436,6 @@
 msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
 msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа long, текущее значение "
+"''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77
@@ -7345,4 +7444,6 @@
 "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
 msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа long (>=0), текущее "
+"значение ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
@@ -7350,4 +7451,6 @@
 msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
 msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение "
+"''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
@@ -7356,4 +7459,6 @@
 "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
 msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа int (>=0), текущее "
+"значение ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
@@ -7362,4 +7467,6 @@
 "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
 msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа boolean, текущее "
+"значение ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
@@ -7369,4 +7476,6 @@
 "''{1}''"
 msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа OsmPrimitiveType, "
+"текущее значение ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
@@ -7440,5 +7549,5 @@
 #, java-format
 msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-msgstr ""
+msgstr "Отсутствует атрибут \"version\" OSM примитива с id {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
@@ -7465,9 +7574,9 @@
 #, java-format
 msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-msgstr ""
+msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72
 msgid "Downloading history..."
-msgstr ""
+msgstr "Загрузка истории..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28
@@ -7478,5 +7587,5 @@
 #, java-format
 msgid "Failed to open connection to API {0}"
-msgstr ""
+msgstr "Не удалось установить соединение с API {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
@@ -7491,5 +7600,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7499,15 +7608,15 @@
 msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Обновить модули"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Скачать модули"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7520,32 +7629,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
 msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+msgstr[0] "{0} Плагин успешно загружен. Пожалуйста, перезагрузите JOSM."
+msgstr[1] "{0} Плагины успешно загружены. Пожалуйста, перезагрузите JOSM."
+msgstr[2] "{0} Плагины успешно загружены. Пожалуйста, перезагрузите JOSM."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr ""
+msgstr "Загрузка Плагина {0}..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr "Пропустить загрузку"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
-msgstr ""
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr "JOSM версии {0} требует плагин {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+msgstr "Загрузить Плагин"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
-msgstr ""
+msgstr "Пропустить Загрузку"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -7566,5 +7676,5 @@
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
-msgstr ""
+msgstr "Плагин {0} требует обновление JOSM до версии {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94
@@ -7593,6 +7703,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Отключить модуль"
@@ -7607,5 +7717,5 @@
 msgstr "Сохранение плагина"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7615,5 +7725,5 @@
 "разрешение переписывать существующие модули."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7621,10 +7731,10 @@
 msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Согласно информации в модуле, автором является {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7633,9 +7743,9 @@
 "ошибке."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Отключить модуль?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7645,5 +7755,5 @@
 "модуль."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7652,19 +7762,19 @@
 "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Информация"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "описание отсутствует"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "Подробнее"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7674,13 +7784,13 @@
 msgstr[2] "Скачать информацию о модуле с {0} сайтов"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Информации о модулях не найдено."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Все установленные модули имеют последнюю версию."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7693,9 +7803,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Скачивание недостающих модулей"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7708,6 +7818,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7730,14 +7840,14 @@
 msgstr "неизвестный"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Версия {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Модуль из поставки JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7998,45 +8108,45 @@
 "{0} км/ч"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извлечение GPS координат из EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Запуск сканирования каталога"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Один из выбранных файлов пуст!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Загрузка фото..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Не удалось получить канонический путь к каталогу {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Скнирование каталога {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Найден пустой файл в каталоге {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Ошибка чтения файлов в каталоге {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Коррелируют с GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8246,20 +8356,20 @@
 msgstr "Секунды: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Совпавшие {0} из {1} фотографий с GPX треком."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Разница во времени {0} дней)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Смещение между треком и фотографией: {0}м {1}с"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8267,13 +8377,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Сопоставление фотографий треку прервано"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Настройка часового пояса и смещения"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Значения по умолчанию"
@@ -8295,5 +8405,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Ошибка при загрузке файла"
@@ -8650,5 +8760,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Пустой слой"
@@ -8750,20 +8860,22 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS Файлы (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr "Ошибки формата: "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "Импорт TangoGPS успешно окончен"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "Импорт TangoGPS окончен ошибкой!"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Ошибка формата файла"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "Импорт NMEA успешно завершён"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Сбой при импорте NMEA!"
+msgid "TCX Files (*.tcx)"
+msgstr "TangoGPS Файлы (*.log)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8788,5 +8900,5 @@
 msgstr "Создать копию линии"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Слой для редактирования GPX трэков"
@@ -8807,11 +8919,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Импортировать путь из слоя данных GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Очистить существующий путь"
@@ -8820,6 +8932,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Не найдено слоя данных GPX"
@@ -8882,6 +8994,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Обновить"
@@ -9113,5 +9225,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
 msgid "An unknown error has occurred"
-msgstr ""
+msgstr "Произошла неизвестная ошибка"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -9190,7 +9302,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "вода"
@@ -9507,8 +9619,11 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>Плагин openstreetbus использует старый сервер appspot.com.<br>Новый "
+"сервер доступен на schokokeks.org.<br>Хотите переключится на новый сервер? "
+"(Строго рекомендуется)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Переключится на новый сервер openstreetbugs?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -9537,14 +9652,14 @@
 "строкой."
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Открытые OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+msgstr "Открывает окно OpenStreetBugs  и активирует автоматическую загрузку"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9678,20 +9793,20 @@
 msgstr "Разрешённые действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "модуль дистанционного управления получил запрос на загрузку данных из API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Подробности запроса: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Разрешить действие?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9817,7 +9932,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Закачка..."
+msgstr "изображение загружается..."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -10012,13 +10126,4 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "В первую очередь Вы должны указать источник настроек тегов."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Импортировать файл TCX..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Импортировать файл TCX как трек GPS"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10174,5 +10279,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
 msgid "No intersection found. Nothing was changed."
-msgstr ""
+msgstr "Пересечений не найдено. Изменений сделано не было."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
@@ -10237,29 +10342,29 @@
 "Открывает диалоговое окно, которое позволяет перейти к определенной местности"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Введите Lat / Lon, чтобы перейти к позиции."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Вы также можете вставить URL из www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Приближение (в метрах)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Перейти туда"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Перейти к позиции"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
@@ -10267,5 +10372,5 @@
 "проверьте."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Невозможно разобрать широту/долготу"
@@ -10587,24 +10692,24 @@
 "Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Проверка параметров:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 "Этот плагин проверяет на наличие ошибок в названиях ключей и их значений."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Неправильно просталенныех тегов линиий - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ошибка проверки правописания строки: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10615,5 +10720,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Неправильная комбинация тегов/значений тегов"
@@ -10621,78 +10726,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Проблемы отображения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Неправильный ключ {0}."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Пустые значения тегов"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Неверный ключ свойств"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Неправильный пробел в названии ключа"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Значение начинается или заканчивается пробелом"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Значения содержат HTML разметку"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Ключа ''{0}'' нет в настройках."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Установки не содержат собственно ключа"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Значение ''{0}'' для ключа ''{1}'' не установлены заранне."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Не содержит зарание устанвленного значения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Проверьте ключи свойств."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Проверьте, что ключ действителен проверен в отношении списка слов."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Использовать сложную проверку"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr "Проверка собственных значений и использование сложных правил тегов."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Исходники TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10702,21 +10807,21 @@
 "openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Добавить в список новый источник."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Править выбранный источник."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Источники данных"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Проверьте правильно значений"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -10724,33 +10829,43 @@
 "установок проверки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Проверить для FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Ищет узлы или линии с FIXME в свойствах какого-либо значения."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Проверить заметки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Проверить содержит ли нарисованная карта ошибки данных"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Использовать файл данных по умолчанию."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Используется файл данных установленный по умолчанию"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Использовать файл данных по умолчанию."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Используется файл данных установленный по умолчанию"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Использовать установленный по умолчанию файл проверки правописания"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
@@ -10758,22 +10873,22 @@
 "(рекомендуется)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Исправить параметры"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Не удалось найти тип элемента"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Не удалось найти  уровень предупреждения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Недопустимое выражение ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10918,7 +11033,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "здание"
@@ -10932,5 +11047,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "область"
@@ -10940,26 +11055,26 @@
 msgstr "Незамкнутая линия"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Несоединённые линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Этот тест ищет линии, край которых расположен очень близко к другой линии."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Последний узел линии рядом с существующим шоссе"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Последний узел линии рядом с другой линией"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Узел линии рядом с другой линией"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Конечный узел связной линии возле другой линии"
@@ -10982,17 +11097,22 @@
 msgstr "Данный тест ищет линии без тегов, пустые, и линии из одной точки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Безымянные линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Править перекрёсток"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Линии без тегов"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Пустые линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Линии из одной точки"
@@ -11030,14 +11150,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
-msgstr ""
+msgstr "Достигнут конец линии"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Произошла ошибка."
@@ -11094,5 +11214,5 @@
 #, java-format
 msgid "WMS: {0}"
-msgstr ""
+msgstr "WMS: {0}"
 
 #. This service serves the purpose of "just this once" without forcing the user
@@ -11110,9 +11230,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
 msgid "Visit Homepage"
-msgstr ""
+msgstr "Домашняя страница"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
 msgid "WMS URL or Image ID:"
-msgstr ""
+msgstr "WMS URL или ID Изображения:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148
@@ -11126,8 +11246,10 @@
 "again."
 msgstr ""
+"Не могу сопоставить введённую ссылку или id с выделенным сервисом. "
+"Пожалуйста попробуйте ещё раз."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
 msgid "No valid WMS URL or id"
-msgstr ""
+msgstr "Нет верных WMS URL или ID"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
@@ -11135,5 +11257,5 @@
 msgstr "Отрегулируйте положение выбранного слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11148,15 +11270,15 @@
 msgstr "Автоматическое скачивание"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11165,37 +11287,37 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Скачать видимые квадраты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Перезагрузить ошибочные фрагменты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Альфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgstr "Сохраниеть WMS слой"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+msgstr "Загрузить WMS слой"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -11203,65 +11325,54 @@
 "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Открыть пустой WMS-слой для загрузки данных из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Настройки модуля WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Название меню"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "Ссылка на WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Имя пункта меню (по умолчанию)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (по умолчанию)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Введите имя пункта меню и URL этого WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Копия поумолчанию"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Пожалуйста, выберите ряд для копирования."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr "Накладывающиеся части"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% широты:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% долготы:"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Скачать"
 
 #. *
@@ -11299,5 +11410,5 @@
 #: build/specialmessages.java:10
 msgid "Audio Device Unavailable"
-msgstr ""
+msgstr "Аудиоустройство недоступно"
 
 #. Java message loading audio data
@@ -11350,4 +11461,5 @@
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
+"Позволяет импортировать файлы различных форматов непосредственно в JOSM"
 
 #. Plugin DirectUpload
@@ -11508,16 +11620,11 @@
 "режиме."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Прямо загрузить TCX файлы из JOSM."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Сделать ряд домов вдоль улицы из одного блока."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11529,5 +11636,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11538,5 +11645,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11548,10 +11655,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12350,4 +12457,64 @@
 msgstr "Доступ"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "да"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12371,5 +12538,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "частный"
@@ -12417,5 +12584,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "назначение"
@@ -12452,5 +12619,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "разрешающее"
@@ -12469,4 +12636,28 @@
 msgid "agricultural"
 msgstr "сельскохозяйственное"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "нет"
 
 #: build/trans_presets.java:315
@@ -12682,6 +12873,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "Автобан"
@@ -12707,6 +12898,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "Автострада"
@@ -12732,6 +12923,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "Основная"
@@ -12757,6 +12948,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "Вторичная"
@@ -12770,5 +12961,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "Третичная"
@@ -12786,5 +12977,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "местного значения"
@@ -12802,5 +12993,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "Служебная"
@@ -12827,6 +13035,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "Строительство"
@@ -12876,5 +13084,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "Круг"
@@ -13853,5 +14061,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "Болото"
@@ -15582,27 +15790,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "спорт"
@@ -17359,5 +17567,5 @@
 #: build/trans_presets.java:2439
 msgid "Edit Beverages Shop"
-msgstr ""
+msgstr "Редактировать магазин напитков"
 
 #. item "Shops/Beverages" text "Name"
@@ -18440,8 +18648,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "велосипедный"
@@ -18510,8 +18718,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "пеший"
@@ -18537,5 +18745,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "метро"
@@ -18665,4 +18873,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18671,4 +18880,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18677,4 +18887,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18683,4 +18894,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18744,7 +18956,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "мост"
@@ -18802,4 +19014,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18925,7 +19138,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -19008,15 +19221,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "уменьшать"
@@ -19058,5 +19271,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "лошадь"
@@ -19266,11 +19479,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "ограждение"
@@ -19308,6 +19521,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "улица"
@@ -19363,7 +19576,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "шоссе"
@@ -19419,8 +19632,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "железная дорога"
@@ -19441,5 +19654,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "услуги"
@@ -19453,5 +19666,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr "брод"
@@ -19472,5 +19685,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "кольцо"
@@ -19485,5 +19698,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr "пункт неотложной помощи"
@@ -19498,5 +19711,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "берег реки"
@@ -19510,5 +19723,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "поток"
@@ -19522,5 +19735,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "док"
@@ -19548,5 +19761,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "акведук"
@@ -19714,13 +19927,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "искусственный"
@@ -19782,7 +19995,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "железнодорожная станция"
@@ -19805,10 +20018,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "другая жд дорога"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "жд дорога сверху"
@@ -19828,7 +20041,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19836,8 +20052,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "Старая жд дорога"
@@ -19882,6 +20102,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "воздушная трасса"
@@ -19895,5 +20115,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "пассажирский терминал"
@@ -19915,5 +20135,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "воздушная трасса темная"
@@ -19927,5 +20147,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "воздушная трасса светлая"
@@ -19973,7 +20193,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "воздушная трасса"
@@ -19990,5 +20210,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "легкая трасси"
@@ -20003,5 +20223,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "промежуточная трасса"
@@ -20016,5 +20236,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "продвинутая трасса"
@@ -20029,5 +20249,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "специалист лыжной трассы"
@@ -20042,5 +20262,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "бесплатная трасса"
@@ -20055,5 +20275,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "трасса для новичков"
@@ -20158,10 +20378,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "энергия"
@@ -20175,5 +20395,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "плотина"
@@ -20187,5 +20407,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "трубопровод"
@@ -20313,12 +20533,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "свободное время"
@@ -20332,5 +20552,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "гавань"
@@ -20402,8 +20622,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "использование"
@@ -20505,10 +20725,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "режим использования"
@@ -20894,22 +21114,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "легкое использование"
@@ -20941,6 +21161,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "легкая вода"
@@ -21001,8 +21221,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "здоровье"
@@ -21355,26 +21575,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "Магазин"
@@ -21446,8 +21666,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "отель"
@@ -21597,9 +21817,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "туризм"
@@ -21671,8 +21891,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "исторический"
@@ -21743,8 +21963,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "зеленый"
@@ -21758,5 +21978,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "карьер"
@@ -21770,5 +21990,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "мусорная свалка"
@@ -21790,5 +22010,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "водоём"
@@ -21802,5 +22022,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "лес"
@@ -21814,5 +22034,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "двор фермы"
@@ -21835,5 +22055,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "розничная продажа"
@@ -21847,5 +22067,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "промышленный"
@@ -21859,5 +22079,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "заброшенная застройка"
@@ -21871,5 +22091,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "участок для застройки"
@@ -21883,5 +22103,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "жд разъезд"
@@ -21938,7 +22158,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "военный"
@@ -21952,5 +22172,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "кладбище"
@@ -21963,5 +22183,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "пик"
@@ -21976,5 +22196,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "ледник"
@@ -21988,5 +22208,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "вулкан"
@@ -22041,8 +22261,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "природный"
@@ -22056,5 +22276,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "кустарник"
@@ -22068,5 +22288,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "здоровье"
@@ -22080,5 +22300,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "лес"
@@ -22092,5 +22312,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "грязь"
@@ -22104,5 +22324,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "пляж"
@@ -22180,8 +22400,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "маршрут"
@@ -22229,7 +22449,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "граница"
@@ -22371,10 +22591,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "место"
@@ -22422,6 +22642,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "адрес"
@@ -22652,10 +22872,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Открыте Воздушные Карты"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22663,5 +22883,5 @@
 msgstr "карты NPE"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22669,107 +22889,145 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Данные OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Велодорожка"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "подложка Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Улицы NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
-msgstr ""
+msgstr "Terraserver Urban"
+
+#~ msgid "Data Layer"
+#~ msgstr "Слой данных"
+
+#~ msgid "Change"
+#~ msgstr "Изменить"
+
+#~ msgid "Rotate"
+#~ msgstr "Вращать"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
 
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже "
-#~ "загруженных элементов есть история."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Восстановление удаленного пути..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Проверка существования узла {0} в прошлом..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Восстановление удаленного отношения..."
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Проверка существования примитива {0} в прошлом..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Сохранить мои"
-
-#~ msgid "Delete mine"
-#~ msgstr "Удалить мои"
+#~ "Проекция \"{0}\" разработана только\n"
+#~ "для широт между 46.1° и 57°.\n"
+#~ "Используйте другую проекцию, если не пользуетесь\n"
+#~ "французским сервером WMS. Не загружайте \n"
+#~ "никаких данных на сервер после этого сообщения."
 
 #~ 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>"
+#~ "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 ""
-#~ "<html>OSM примитив с id <strong>{0}</strong> был удален<br>с сервера "
-#~ "другим картографом.<br><br>Нажмите <strong>{1}</strong> для сохранения "
-#~ "вашего примитива и игнорирования попытки удаления.<br> Ваш примитив будет "
-#~ "добавлен с новым id.<br>Нажмите <strong>{2}</strong> для согласия с "
-#~ "удалением примитива, (ваш примитив будет удален).<br>Нажмите <strong>{3}</"
-#~ "strong> для отмены.<br>"
+#~ "Проекция \"{0}\" разработана только для\n"
+#~ "широт между 45.7° и 47.9° и долгот между 5.7° и 10.6°.\n"
+#~ "Если Вы не работаете над данными,\n"
+#~ "относящимися к  Швейцарии либо Лихтенштену, \n"
+#~ "воспользуйтесь другой системой проекции .\n"
+#~ "Не делайте выгрузку данных после данного сообщения."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Конфликты: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Источник предустановок тегов"
 
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "<html>Выбрано  <strong>{0}</strong> примитивов <br>для индивидуального "
-#~ "обновления. Пожалуйста, уменьшите выделение <br>до макс. {1} примитивов.</"
-#~ "html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Выборка слишком большая"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Картинка {0}  не существует или произошла ошибка чтения."
+#~ "Источник (URL или имя файла) файла с предустановками тегов. См. http://"
+#~ "josm.openstreetmap.de/wiki/TaggingPresets для большей информации."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Добавить новый источник предустановки тегов в список."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Источники предустановок тегов"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Импортировать файл TCX..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Импортировать файл TCX как трек GPS"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Накладывающиеся части"
+
+#~ msgid "% of lat:"
+#~ msgstr "% широты:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% долготы:"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Прямо загрузить TCX файлы из JOSM."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "подложка Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Загрузка данных"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Ещё не реализовано."
+
 #~ msgid "Email"
 #~ msgstr "Электронная почта"
@@ -22777,4 +23035,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Разрешить конфликты"
+
+#~ msgid "Object"
+#~ msgstr "Объект"
 
 #~ msgid "{0} object has conflicts:"
@@ -22816,4 +23077,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Разрешить {0} конфликтов в {1} объектах"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Нажмите \"Обновить\" для обновления списка"
+
+#~ msgid "Revert"
+#~ msgstr "Откатить"
+
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Откатить состояние выбранных объектов до версии, указанной в списке "
+#~ "правок."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22988,4 +23265,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже "
+#~ "загруженных элементов есть история."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -23041,2 +23325,50 @@
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "Выгрузка прервана по неизвестной причине"
+
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "Картинка {0}  не существует или произошла ошибка чтения."
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "Восстановление удаленного пути..."
+
+#~ msgid "Checking whether node {0} is gone ..."
+#~ msgstr "Проверка существования узла {0} в прошлом..."
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "Восстановление удаленного отношения..."
+
+#~ msgid "Checking whether primitive {0} is gone ..."
+#~ msgstr "Проверка существования примитива {0} в прошлом..."
+
+#~ msgid "Keep mine"
+#~ msgstr "Сохранить мои"
+
+#~ msgid "Delete mine"
+#~ msgstr "Удалить мои"
+
+#~ msgid ""
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
+#~ msgstr ""
+#~ "<html>OSM примитив с id <strong>{0}</strong> был удален<br>с сервера "
+#~ "другим картографом.<br><br>Нажмите <strong>{1}</strong> для сохранения "
+#~ "вашего примитива и игнорирования попытки удаления.<br> Ваш примитив будет "
+#~ "добавлен с новым id.<br>Нажмите <strong>{2}</strong> для согласия с "
+#~ "удалением примитива, (ваш примитив будет удален).<br>Нажмите <strong>{3}</"
+#~ "strong> для отмены.<br>"
+
+#~ msgid ""
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
+#~ msgstr ""
+#~ "<html>Выбрано  <strong>{0}</strong> примитивов <br>для индивидуального "
+#~ "обновления. Пожалуйста, уменьшите выделение <br>до макс. {1} примитивов.</"
+#~ "html>"
+
+#~ msgid "Selection too big"
+#~ msgstr "Выборка слишком большая"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 16400)
+++ applications/editors/josm/i18n/po/sk.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-27 03:16+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-04 18:00+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,8 +16,8 @@
 "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-06-27 12:19+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,32 +32,33 @@
 msgstr "Nápoveda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 "Typ projekcie nie je možné prečítať z nastavení. Použije sa Mercator "
 "projekcia."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Tip: Pri nahrávaní nových údajov zo servera nastali nejaké zmeny."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Neuložené zmeny"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Uložiť a Ukončiť"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Zrušiť a Ukončiť"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -70,12 +71,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -89,7 +90,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -100,32 +101,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorujem skomolenú URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorujem poškodený súbor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "NEZNÁMA"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "O aplikácii"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Zobraziť obrazovku \"O Aplikácii\""
@@ -133,10 +134,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -144,25 +145,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Verzia {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Posledná zmena {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java verzia {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Domovská stránka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Správy o chybách"
@@ -172,5 +174,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -178,27 +180,27 @@
 msgstr "Informácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Informačné súbory"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revízia"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Príspevok"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "O programe JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Súbor nie je možné nájsť."
@@ -210,14 +212,16 @@
 "OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"VAROVANIE: neočakávaný formát z API základne URL. Presmerovávanie na stránku "
+"histórie pre OSM pôvodné budú pravdepodobne chybné. API základňa URL je: "
+"''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Prosím vyberte aspoň jeden bod, alebo cestu."
+msgstr "Prosím vybrať aspoň jeden už nahraný bod, cestu, alebo reláciu."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Varovanie"
@@ -229,4 +233,6 @@
 "primitives only"
 msgstr ""
+"VAROVANIE: uvedený prehliadač okien poprvýkrát  {0} of {1} {0} of {1} "
+"vybrané iba pôvodné"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -272,5 +278,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Zemepisná šírka"
@@ -279,5 +285,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Zemepisná dĺžka"
@@ -285,5 +291,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Zarovnať body do kruhu"
@@ -296,5 +302,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -353,18 +359,19 @@
 "{0}, max is {1}"
 msgstr ""
+"Aktuálne množstvo zmien prekročilo maximálne množstvo zmien, aktuálne je "
+"{0}, maximálne je {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
 msgid "API Capabilities Violation"
-msgstr ""
+msgstr "API Capabilities Violation"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "Neúspešná inicializácia API. Prosím skúste to znova pozdejšie ."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "Nie je inicializované"
+msgstr "API inicializácia neúspešná"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -374,4 +381,6 @@
 "{1}"
 msgstr ""
+"Varovanie: automatické skracovanie hodnôt a značiek ''{0}'' pri vymazávaní "
+"pôvodných {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
@@ -381,48 +390,49 @@
 "length {2}. Values length is {3}."
 msgstr ""
+"Dĺžka hodnoty pre značku ''{0}'' pri pôvodnej {1} prekročila max. povolenú "
+"dĺžku {2}. Dĺžka hodnôt je {3}."
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Predpokladaný priestupok"
+msgstr "Predpoklad Porušenia"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "údaje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "výber"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "stiahnuté"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Priblížiť na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Priblížiť pohľad na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -432,9 +442,9 @@
 msgstr "Zobrazenie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Nie je zvolené nič, čo by se mohlo priblížiť."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Nie je žiadny konflikt, čo by sa mohol priblížiť"
@@ -525,38 +535,42 @@
 msgstr "Prosím zvoľ niečo pre kopírovanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Vytvoriť kružnicu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 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:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr ""
-"Prosím označte presne tri body, alebo cestu pozostávajúcu z troch bodov."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Tieto body netvoria kružnicu."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr ""
+"Prosím označte presne tri body, alebo cestu pozostávajúcu z troch bodov."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Odstrániť"
@@ -606,5 +620,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -713,11 +727,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -728,5 +743,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Chyba"
@@ -736,30 +751,30 @@
 msgstr "Zvoľte preddefinovanú licenciu"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM Online Nápoveda"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Otvoriť v prehliadači"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Upraviť"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -767,14 +782,14 @@
 msgstr "Znovu načítať"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Nápovedu môžete upravovať iba z online nápovedy JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Chyba pri načítaní stránky {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
@@ -782,5 +797,5 @@
 "Chýbajúca stránka s pomocou. Vytvorte to v <A HREF=\"{0}\">english</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -797,18 +812,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Zobraz informáce o histórii ciest a bodov v OSM"
+msgstr "Zobraziť históriu o OSM cestách, bodoch, alebo relácií."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "História Elementu"
+msgstr "Info o Elemente"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Zobraz informáce o histórii ciest a bodov v OSM"
+msgstr "Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -870,5 +882,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "Zrkadlo"
@@ -907,10 +919,10 @@
 msgstr "vpravo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Presunúť {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -918,5 +930,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Nemôžem presúvať objekty mimo svet."
@@ -1111,5 +1123,5 @@
 msgstr "Súbor {0} existuje. Prepísať ho?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1118,26 +1130,25 @@
 "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Prázdny dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dokument neobsahuje dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Uložiť akokoľvek"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1147,36 +1158,36 @@
 "vyriešené, ako by boli všetky odmietnuté. Pokračovať?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Zamietnuť konflikty a Uložiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Uložiť OSM súbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Uložiť GPX súbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Uložiť vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Nemôžem zálohovať súbor."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Neznáma prípona súboru"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Počas ukladania došlo k chybe."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Počas obnovenia zálohy došlo k chybe."
@@ -1229,6 +1240,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Zavrieť"
@@ -1305,12 +1317,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Funkcia zakladajúca vzťahy (relation) členov zkopírovala všetky nové "
-"cesty..\n"
-"Môžete preveriť správnosť, ak je to nevyhnutné."
+"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:319
@@ -1493,68 +1503,68 @@
 msgstr "Výber je prázdny"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Uložiť do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Uložiť všetky zmeny na OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Pridané objekty:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Upravené objekty:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Odstránené objekty:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Doplniť krátky komentár k nahrávaným zmenám"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Uložiť tieto úpravy?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Nahrať zmeny"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Sú tu nevyriešené konflikty. Musíte jich najskôr vyriešiť."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Žiadne zmeny pre uloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Nahrávanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr "Aktualizácia pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchronizovať {0} {1} iba"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovať celú dátovú sadu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1575,17 +1585,17 @@
 "zrušenie a pokračovanie v editácii.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Zistený konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "neočakávaná hodnota. Dostal {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1600,5 +1610,5 @@
 "<strong>{1}</strong> pre zrušenie a pokračovanie v editácii.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1606,5 +1616,5 @@
 "Varovanie: chybné záhlavie \"{0}\" nie je zhoda  s očakávanou schémou \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1617,9 +1627,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr "Predpokladaný priestupok"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1632,18 +1642,18 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr "Pôvodné je už zmazané"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "Nahrávanie na OSM API neúspešné"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1751,24 +1761,15 @@
 msgstr "Nekomprimované (Raw) GPS dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Sťahujem dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Neboli importované žiadne dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Údajová vrstva {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "údaje OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Vrstva údajov"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1786,5 +1787,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>There are {0} primitives in your local dataset which<br>might be "
@@ -1794,9 +1795,9 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
-"<html>Sú tam {0} pôvodné vo vašej lokálnej dátovej sade ktoré<br>by mohni "
-"byť zmazané na servery. Ak pozdejšie skúsite vymazať, alebo<br>aktualizovať "
-"ich na server príde pravdepodobne správa<br>konflikt.<br><br>Click <strong>"
-"{1}</strong> na kontrolu týchto pôvodných individuálne.<br>Click <strong>{2}"
-"</strong> pre ignorovanie.<br></html>"
+"<html>Je tam {0} pôvodných vo vašej lokálnej dátovej sade, ktoré<br>ktoré by "
+"mohli byť zmazané zo servera. Ak pozdejšie skúsite zmazať, "
+"alebo<br>aktualizovať ich server pravdepodobne ohlási<br>konflikt."
+"<br><br>Click <strong>{1}</strong>kontrola stavutýchto pôvodných<br>na "
+"servery.<br>Click <strong>{2}</strong>ignorovať.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
@@ -1815,5 +1816,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1917,5 +1918,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
@@ -1927,5 +1928,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Pustite tlačítko myši k zastaveniu otáčania"
@@ -1943,7 +1944,7 @@
 "záznam prehrávať; SHIFT+uvoľnite synchronizovaný zvukový záznam v tom bode."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1951,9 +1952,9 @@
 msgstr "Výber"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Zvoliť, posunúť a otáčať objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1963,5 +1964,28 @@
 msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Presunúť vľavo"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Presunúť vľavo"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Späť"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1969,5 +1993,5 @@
 "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1986,5 +2010,5 @@
 msgstr "Priblížiť/Vzdialiť a pohyb mapy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2259,35 +2283,27 @@
 msgstr "Chyba počas komunikácie so serverom"
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Pridať"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Zmeniť"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Zmazať {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Zmeniť {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Odstranené \"{0}\" pre {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Nastavené {0}={1} pre {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2298,19 +2314,26 @@
 msgstr[2] "objektov"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Odstranené \"{0}\" pre {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Nastavené {0}={1} pre {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
 msgstr "ZmeňÚlohuČlenaRelácie"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2318,25 +2341,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr "nemôžem vyriešiť nerozhodnutý konflikt"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Zmazať {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Zmazať {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Konfliktné vzťahy (relation)"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2347,11 +2370,11 @@
 "Zmazať zo vzťahu (relation)?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2362,10 +2385,10 @@
 "Zmazať zo vzťahu (relation)?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Rozdeliť segment cesty"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2377,20 +2400,20 @@
 "<br>Naozaj ich chcete zmazať?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "Vyriešte konflikty v zmazaných (state) v {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Presunúť"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2407,5 +2430,5 @@
 #, java-format
 msgid "removing reference from way {0}"
-msgstr ""
+msgstr "vybranie odkazu z cesty {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
@@ -2419,9 +2442,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid "removing reference from relation {0}"
-msgstr "Odstránený Prvok z Relácií"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+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}"
@@ -2429,34 +2452,41 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+#, fuzzy, java-format
+msgid "RemoveRelationMember {0} {1}"
 msgstr "Odstrániť súvisiaceho(vzťahového) člena"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Otočiť"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Zmazať {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sekvencia"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../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:41
+#: ../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:52
+#: ../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
+#, fuzzy
+msgid "Main.ds doesn't include node {0}"
+msgstr "Moja dátová sada nebude obsahovať značky s kľúčom {0}"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2553,25 +2583,51 @@
 msgstr "Nemôžem nahrať predvoľby zo servera."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "parameter ''{0}'' nesmie byť nulový"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "Stupne"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "J"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "V"
@@ -2582,5 +2638,5 @@
 msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2605,5 +2661,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2706,17 +2762,13 @@
 msgstr "nenájdená staršia verzia. História je prázdna."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr "Nemôžem nájsť pôvodné s id {0} a verziou {1} v tejto dátovej sade"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-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"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2724,16 +2776,5 @@
 msgstr "parameter ''{0}'' > 0 očakávaný, dostáva ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr "parameter ''{0}'' nesmie byť nulový"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s id ''{1}''"
@@ -2745,127 +2786,127 @@
 msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Cesta označená ako plocha nie je uzavretá."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s menej, než dvoma bodmi."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr "Najdená viac než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 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:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Viac ako jedna \"via\" najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznáma funkcia ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, 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:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "Nenajdená cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Nenajdená cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 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:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Štýl pre obmedzenie {0} nenajdený."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Vnútorná(inner) cesta ''{0}'' je vonku."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "neoznačený"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "text"
@@ -2873,5 +2914,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2880,4 +2921,7 @@
 "Keeping my primitive. "
 msgstr ""
+"Moje pôvodné s id {0} a verziou {1} sú viditeľné pretože ich pôvodné sú v "
+"nižšej verzii {2} nie sú viditeľné. Nenastala dohoda s touto nezrovnalosťou. "
+"Zostávajú moje pôvodné. "
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -2899,6 +2943,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "pozadie"
@@ -2908,24 +2952,9 @@
 msgstr "označiť (highlight)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Projekcia \"{0}\" je navrhnutá iba\n"
-"pre zemepisné šírky medzi 46.1° a 57°.\n"
-"Použite iný projekčný systém, ak nepoužívate\n"
-"francúzsky WMS server.\n"
-"Nenahrávajte žiadne dáta po zobrazení tejto hlášky!"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2941,36 +2970,24 @@
 "a začnite v novej vrstve a v novej zóne."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambertova zóna (Francie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertova zóna (Estónsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercatorova projekcia"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Projekcia \"{0}\" je navrhnutá iba pre\n"
-"zemepisné šírky medzi 45.7° and 47.9°\n"
-"a zemepisné dĺžky medzi 5.7° and 10.6°.\n"
-"Použite iný projekčný systém ak nepracujete\n"
-"s dátami zo Švajčiarska, alebo Lichtenštajnska.\n"
-"Nenahrávajte žiadne dáta po tejto správe."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Švajčiarsko)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Presunúť {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2982,14 +2999,14 @@
 msgstr "Nemôžem zapísať do záložiek."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Správu dňa nie je možné zobraziť"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- teraz používaná verzia je {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Sťahujem \"Správu dňa\""
@@ -3184,5 +3201,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3244,5 +3260,5 @@
 msgstr "Oddialiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "mierka"
@@ -3276,8 +3292,13 @@
 msgstr "(žiadny objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "vrstva nie je v zozname"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3285,9 +3306,9 @@
 msgstr "Pripája sa na OSM server..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Chyba pri rozkladaní"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Súbor nebol nájdený"
@@ -3347,4 +3368,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3354,4 +3376,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "Body"
@@ -3359,5 +3383,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Členovia"
@@ -3570,7 +3595,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3657,4 +3682,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3662,4 +3690,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3671,4 +3700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3690,14 +3720,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Chyba počas komunikácie so serverom"
+msgstr ""
+"<html>Nastala chyba počas komunikácie so serverom<br>Detaily: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Chyba počas komunikácie so serverom"
+msgstr "Spojenie so serverom zlyhalo"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3763,7 +3793,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
-#, fuzzy
 msgid "Visible State:"
-msgstr "Vymazaný stav:"
+msgstr "Viditeľný Stav:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
@@ -3784,22 +3813,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
-#, fuzzy
 msgid "visible (on the server)"
-msgstr "Pôvodný vymazaný na servery"
+msgstr "viditeľné (na servery)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
-#, fuzzy
 msgid "not visible (on the server)"
-msgstr "Pôvodný vymazaný na servery"
+msgstr "neviditeľné (na servery)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Prosím zadajte meno pre umiestnenie."
+msgstr "Zostáva klon lokálnej verzie"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
-#, fuzzy
 msgid "Physically delete from local dataset"
-msgstr "Moja verzia (miestna(local) dátova sada)"
+msgstr "Fyzicky vymazať z lokálnej verzie"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
@@ -3828,18 +3853,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
-#, fuzzy
 msgid "Keep my visible state"
-msgstr "Udržať môj vymazaný stav"
+msgstr "Zostáva môj viditeľný stav"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Áno, obnoviť ich tiež"
+msgstr "Áno, vynulovať id"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Žiaden dátum"
+msgstr "Nie, zrušiť"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3850,17 +3872,19 @@
 "agree?</html>"
 msgstr ""
+"<html>Ponechať vašu lokálnu verziu, JOSM<br>má nastaviť id z {0} {1} na 0."
+"<br>Pri ďalšom nahrávaní na server bude priradené<br>nové id.<br>Súhlasíte?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Nastaviť id na 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
-#, fuzzy
 msgid "Keep their visible state"
-msgstr "Udržať ich vymazaný stav"
+msgstr "Ponechať svoj viditeľný stav"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
-msgstr ""
+msgstr "Áno, očistiť to"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
@@ -3870,23 +3894,25 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
+"<html>JOSM odstráni vaše lokálne pôvodné s id {0}<br>z dátovej sady."
+"<br>Súhlasíte?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "odobrať z výberu"
+msgstr "Odstrániť z dátovej sady"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
-#, fuzzy
 msgid "Undecide conflict between visible state"
-msgstr "Nevyriešené konflikty medzi vymazávaným stavom"
+msgstr "Nerozhodnutý konflikt medzi viditeľnými stavom"
 
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Úloha"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Pôvodný"
@@ -3905,4 +3931,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<nedefinované>"
@@ -3926,8 +3954,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3938,7 +3966,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3994,5 +4023,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Zásobník príkazov"
@@ -4003,6 +4032,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -4013,5 +4042,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -4020,10 +4049,29 @@
 msgstr "Prepnúť: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Príkazový Stĺpik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Spojenie konfliktov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Vyriešiť"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Otvoriť dialógové okno pre spojenie(merge) všetkých vybraných bodov (items) "
+"v obsahu na vrchu."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -4033,28 +4081,4 @@
 "Nastaviť vybrané elementy(prvky) na mape, podľa vybratých prvkov v obsahu na "
 "vrchu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Vyriešiť"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Otvoriť dialógové okno pre spojenie(merge) všetkých vybraných bodov (items) "
-"v obsahu na vrchu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Spojenie konfliktov"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konflikty: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
@@ -4095,45 +4119,48 @@
 "riešenia konfliktov.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Kľuknite na obnoviť pre aktualizáciu zoznamu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "História"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Zobraziť históriu všetkých zobrazených objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Dátum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr "<html>Chybný priebeh nahrávania zo servera. Detaily:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "index je mimo hranice Dostať {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr "Položka priebehu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "Nahrať priebeh"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr "Nahrávam priebeh pre {0}s id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Znovu nahrať vybrané objekty a obnoviť zoznam."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Vrátiť naspäť"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Vrátiť stav všetkých vybratých objektov na verziu vybratú zo zoznamu "
-"histórie."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Zatiaľ nie je implementované."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "Ukázať"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr "Zobraziť priebeh z vybraných pôvodných"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4268,4 +4295,18 @@
 msgid "Add Properties"
 msgstr "Pridať vlastnosti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Pridať"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4380,9 +4421,9 @@
 msgstr "Výber: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Uvoľniť panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4391,5 +4432,5 @@
 "lište."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kľuknite pre minimalizovanie/maximalizovanie obsahu panelu"
@@ -4419,179 +4460,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Použiť zmeny"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Základný"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Využité (kým)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "zviazané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Značky (prázdne hodnoty zmazaných značiek)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Posunút Hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Pridať všetky zvolené objekty medzi členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Pridať vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Pridať všetky zvolené objekty medzi členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Odstrániť označené"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Šport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Zmazať vybratý zdroj zo zoznamu."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Posunúť dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Presunúť zvolenú vrstvu o riadok dolu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 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"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Stiahnuť členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "áno"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "nie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Členov: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editor relácie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Vznikli konflikty počas importu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Chyba parsovania odozvy servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Nemôžem sa pripojiť na server."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr "Chyba počas komunikácie so serverom"
@@ -4626,21 +4590,21 @@
 msgstr "Najskôr zvoľte záložku"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min šírka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max šírka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4650,5 +4614,5 @@
 "oblasti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Ohraničujúcí box"
@@ -4798,694 +4762,42 @@
 msgstr "Čísla dlaždíc"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Obrázky pre {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Čítať GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Žiadny čas pre bod {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Nenájdené žiadne obrázky s časovými značkami."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Čítam {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Obrázky s GPS súradnicami"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Štart GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Koniec GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "súčastná odchylka: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "rozdiel časových pásiem: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "obrázok"
-msgstr[1] "obrázky"
-msgstr[2] "obrázkov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} vo vnútry stopy (track)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Synchronizovať hodiny"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG obrázky (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Dáta v súbore \"{0}\" nemohli byť parsované."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "V súbore \"{0}\" nie je časová značka EXIF"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Obrázok"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchronizovať čas s GPS zariadením"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Zadaný čas nemôže byť rozparsovaný"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps poloha bodu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Prispôsobiť kresliacu trasu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Použíť globálne nastavenie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Výber nastavenia kreslenej čiary"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Prispôsobiť farbu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predvolené"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Zvoľte farbu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Značky z pomenovaných bodov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Pomenovanie trackpoints od {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importovať zvuk"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audiosúbory (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Zukové značky z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importovať obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} stopa(track), "
-msgstr[1] "{0} stopy(track), "
-msgstr[2] "{0} stôp(track), "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} trasa, "
-msgstr[1] "{0} trasy, "
-msgstr[2] "{0} trás, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint (bod cesty)"
-msgstr[1] "{0} waypointy (body cesty)"
-msgstr[2] "{0} waypointov (bodov cesty)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Meno: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Popis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Časové rozpätie: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Dĺžka: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Konvertovať do dátovej vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.<br>K "
-"chcete nahrať stopy (traces), pozrite sem:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Prevedené z: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Stiahnuť všetko vo vnútry:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metrov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Maximálna plocha na požiadavku:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} štvorcových km"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí dát."
-"<br>Chcete pokračovať?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Niektoré body (waypointy) s časovou značkou pred začiatkom stopy(track), "
-"alebo za koncom, boli vynechané, alebo presunuté na začiatok."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Niektoré waypointy, ktoré bili príliš ďaleko od stopy pre rozumné určenie "
-"ich času boli vynechané."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "mimo ukladanej oblasti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "verzia {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "Boli tam {0} konflikty počas importu."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} se skladá z:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} zmazané.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "neuršený (unset)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "Verzia API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Previesť do GPX vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "stopa"
-msgstr[1] "stopy"
-msgstr[2] "stopy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "bod"
-msgstr[1] "body"
-msgstr[2] "bodov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "stopa s {0} bodmi"
-msgstr[1] "stopy s {0} bodmi"
-msgstr[2] "stopy s {0} bodmi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} skladá sa z {1} stopy"
-msgstr[1] "{0} skladá sa z {1} stôp"
-msgstr[2] "{0} skladá sa z {1} stôp"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} bod"
-msgstr[1] "{0} body"
-msgstr[2] "{0} bodov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "gps značka"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "značka"
-msgstr[1] "značky"
-msgstr[2] "značiek"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} pozostáva z {1} značky"
-msgstr[1] "{0} pozostáva z {1} značiek"
-msgstr[2] "{0} pozostáva z {1} značiek"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Synchronizovať audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-"Potrebujete pozastaviť(pause) audio v momente, keď podľa sluchu určíš bod "
-"synchronizácie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Zvuk zosynchronizovaný na bode {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-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:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"Potrebujete pozastaviť(pause) audio v bode na stope, kde chcete mať znažku."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Neexistujú zvukové značky v tejto vrstve, voči ktorým by bolo možné nastaviť "
-"posunutie."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-"Potrebujete presunúť tlačítko \"play head\" blízko GPX stopy pre ktorú je "
-"priradená zvuková stopa, ktorá sa má prehrávať (po prvej značke)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Potrebujete ťahať \"play head\" so stlačeným SHIFT až na audio značku, alebo "
-"až na track point, ktorý chcete zosynchronizovať."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Nie je možné vytvoriť novú zvukovú značku"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL bolo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Chyba zobrazovania URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Pokročilé voľby"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Ručné nastavenie. Používajte opatrne!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Hľadať: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Súčasná hodnota je východzia"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Východzia hodnota je''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Východzia hodnota nie je známa (ešte nebola definovaná)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Prosím vyberte riadok na úpravu."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Nová hodnota pre {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Prosím vyberte riadok na odstránenie."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Zadajte novú dvojicu klúč/hodnota"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Zobraziť Zvukové(Audio) menu"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Popis zvukovej (obrázka a web) značky"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Zobraziť prehrávanú(live) zvukovú stopu."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Vytvoriť bez zvukové značky pri čítaní GPX."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Podrobné body cesty(waypoints) s platnou časovou značkou."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Podrobné body cesty s časom odhadovaným z pozície stopy(track)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Pomenované trasové body"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Zmenené časy (časových značiek) zvukových súborov."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "Začiatok stopy (bude použité vždy ak nie sú dostupné iné značky)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Zobraziť alebo skryť menu Zvuk v menu hlavnej ponuky."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Zobrazená pohybujúca sa ikona predstavuje bod na synchronizovanej stope, kde "
-"sa práve prehráva vaša nahrávka."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Umiestniť text vedľa zvukovej značky (a obrázok a web) takisto ako jeho "
-"ikony."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Automatické vytvorenie vrstvy značiek z bodov cesty pri otvorení GPX vrstvy."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Pri importe zvuku urobiť značky z..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Pri importe zvuku používam záznam na značky v GPX vrstve"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Automatické vytvorenie zvukových značiek z bodov stopy(trackpoints) (radšej "
-"než podrobné body cesty) s menami a popismi."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Vytvorenie zvukových značiek na mieste, kde čas stopy zodpovedá času "
-"uloženia každého zvukové WAV súboru."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Skok v sekundách dopredu, alebo dozadu, podľa stlačeného náležitého tlačítka."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Skok Dopredu/vzad (sekundy)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Číslo, ktorým je násobená rýchlosť pretáčania."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Rýchle pretáčanie"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Záznam sa začne prehrávať o o uvedený počet sekúnd skôr (alebo pozdejšie, "
-"pri zápornom čísle), ako je požadované."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Uvedený čas (sekundy)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-"Časový posun medzi spustením nahrávania a skutočným začiatkom nahrávania."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Kalibrácia zvukového nahrávania"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Farba"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "Priebeh (History) pre {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "Zavrieť dialógové okno"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+"priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr "priebeh nie je inicializovaný. Chybný súbor aktuálnych pôvodných."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "Bod {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6195,5 +5507,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6344,40 +5657,757 @@
 msgstr "Názov"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Verzia <strong>{0}</strong> vytvoraná na <strong>{1}</strong> podľa "
+"<strong>{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Verzia {0} vytvorená na {1} podľa {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Verzia"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Obrázky pre {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Čítať GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Žiadny čas pre bod {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Nenájdené žiadne obrázky s časovými značkami."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Čítam {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Obrázky s GPS súradnicami"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Štart GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Koniec GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "súčastná odchylka: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "rozdiel časových pásiem: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "obrázok"
+msgstr[1] "obrázky"
+msgstr[2] "obrázkov"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} vo vnútry stopy (track)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Synchronizovať hodiny"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG obrázky (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Dáta v súbore \"{0}\" nemohli byť parsované."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "V súbore \"{0}\" nie je časová značka EXIF"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Obrázok"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchronizovať čas s GPS zariadením"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Zadaný čas nemôže byť rozparsovaný"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps poloha bodu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Prispôsobiť kresliacu trasu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Použíť globálne nastavenie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Výber nastavenia kreslenej čiary"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Prispôsobiť farbu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predvolené"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Zvoľte farbu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Značky z pomenovaných bodov"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Pomenovanie trackpoints od {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importovať zvuk"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audiosúbory (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Zukové značky z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importovať obrázky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} stopa(track), "
+msgstr[1] "{0} stopy(track), "
+msgstr[2] "{0} stôp(track), "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} trasa, "
+msgstr[1] "{0} trasy, "
+msgstr[2] "{0} trás, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint (bod cesty)"
+msgstr[1] "{0} waypointy (body cesty)"
+msgstr[2] "{0} waypointov (bodov cesty)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Meno: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Popis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Časové rozpätie: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Dĺžka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Konvertovať do dátovej vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.<br>K "
+"chcete nahrať stopy (traces), pozrite sem:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Prevedené z: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Stiahnuť všetko vo vnútry:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metrov"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Maximálna plocha na požiadavku:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} štvorcových km"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí dát."
+"<br>Chcete pokračovať?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Niektoré body (waypointy) s časovou značkou pred začiatkom stopy(track), "
+"alebo za koncom, boli vynechané, alebo presunuté na začiatok."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Niektoré waypointy, ktoré bili príliš ďaleko od stopy pre rozumné určenie "
+"ich času boli vynechané."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Údajová vrstva {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "mimo ukladanej oblasti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "verzia {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Boli tam {0} konflikty počas importu."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} se skladá z:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} zmazané.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "neuršený (unset)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "Verzia API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Previesť do GPX vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "stopa"
+msgstr[1] "stopy"
+msgstr[2] "stopy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "bod"
+msgstr[1] "body"
+msgstr[2] "bodov"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "stopa s {0} bodmi"
+msgstr[1] "stopy s {0} bodmi"
+msgstr[2] "stopy s {0} bodmi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} skladá sa z {1} stopy"
+msgstr[1] "{0} skladá sa z {1} stôp"
+msgstr[2] "{0} skladá sa z {1} stôp"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} bod"
+msgstr[1] "{0} body"
+msgstr[2] "{0} bodov"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "gps značka"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "značka"
+msgstr[1] "značky"
+msgstr[2] "značiek"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} pozostáva z {1} značky"
+msgstr[1] "{0} pozostáva z {1} značiek"
+msgstr[2] "{0} pozostáva z {1} značiek"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Synchronizovať audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+"Potrebujete pozastaviť(pause) audio v momente, keď podľa sluchu určíš bod "
+"synchronizácie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Zvuk zosynchronizovaný na bode {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+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:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Potrebujete pozastaviť(pause) audio v bode na stope, kde chcete mať znažku."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Neexistujú zvukové značky v tejto vrstve, voči ktorým by bolo možné nastaviť "
+"posunutie."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Potrebujete presunúť tlačítko \"play head\" blízko GPX stopy pre ktorú je "
+"priradená zvuková stopa, ktorá sa má prehrávať (po prvej značke)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Potrebujete ťahať \"play head\" so stlačeným SHIFT až na audio značku, alebo "
+"až na track point, ktorý chcete zosynchronizovať."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Nie je možné vytvoriť novú zvukovú značku"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL bolo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Chyba zobrazovania URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Pokročilé voľby"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Ručné nastavenie. Používajte opatrne!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Hľadať: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Súčasná hodnota je východzia"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Východzia hodnota je''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Východzia hodnota nie je známa (ešte nebola definovaná)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Prosím vyberte riadok na úpravu."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Nová hodnota pre {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Prosím vyberte riadok na odstránenie."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Zadajte novú dvojicu klúč/hodnota"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Zobraziť Zvukové(Audio) menu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Popis zvukovej (obrázka a web) značky"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Zobraziť prehrávanú(live) zvukovú stopu."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Vytvoriť bez zvukové značky pri čítaní GPX."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Podrobné body cesty(waypoints) s platnou časovou značkou."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Podrobné body cesty s časom odhadovaným z pozície stopy(track)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Pomenované trasové body"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Zmenené časy (časových značiek) zvukových súborov."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "Začiatok stopy (bude použité vždy ak nie sú dostupné iné značky)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Zobraziť alebo skryť menu Zvuk v menu hlavnej ponuky."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Zobrazená pohybujúca sa ikona predstavuje bod na synchronizovanej stope, kde "
+"sa práve prehráva vaša nahrávka."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Umiestniť text vedľa zvukovej značky (a obrázok a web) takisto ako jeho "
+"ikony."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Automatické vytvorenie vrstvy značiek z bodov cesty pri otvorení GPX vrstvy."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Pri importe zvuku urobiť značky z..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "Pri importe zvuku používam záznam na značky v GPX vrstve"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Automaticky vytvoriť zvukové značky z bodov stopy (trackpoints) (radšej než "
+"podrobné body cesty) s menami a popismi."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Vytvorenie zvukových značiek na mieste, kde čas stopy zodpovedá času "
+"uloženia každého zvukové WAV súboru."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Skok v sekundách dopredu, alebo dozadu, podľa stlačeného náležitého tlačítka."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Skok Dopredu/vzad (sekundy)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "Číslo, ktorým je násobená rýchlosť pretáčania."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Rýchle pretáčanie"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Záznam sa začne prehrávať o o uvedený počet sekúnd skôr (alebo pozdejšie, "
+"pri zápornom čísle), ako je požadované."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Uvedený čas (sekundy)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+"Časový posun medzi spustením nahrávania a skutočným začiatkom nahrávania."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Kalibrácia zvukového nahrávania"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Farba"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Farebný štýl {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Vrstva: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Vybrať"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Zvoľte farbu pre {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Zadať východzie (prednastavené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Zadať všetko východzie (prednastavené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Farby použité rôznymi objektami v JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Farby"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6386,29 +6416,29 @@
 msgstr "Všetko"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Miestne súbory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Žiadny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Zosilniť líniu, ak žiadne segmenty nie su naimportované."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Kresliť väčšie GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rýchlosť (červená = pomaly, zelená = rýchlo)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Hustota pozícií (červená = vysoká, zelená = nízka, ak je dostupná)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna farba (môže byť prispôsobená pre pomenované vrstvy)"
@@ -6416,5 +6446,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6435,5 +6465,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6471,5 +6501,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6482,50 +6512,50 @@
 msgstr "Pešo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Kresliť šípky v smere jazdy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Rýchle vykresľovanie (vypadá nepekne)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Iba dôležité smery (napr. jednosmerka)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Iba na začiatku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Vykresliť segmenty s poradovými číslami"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykresliť ohraničujúci box stiahnutých dát"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykresľovať virtuálne body v mode výberu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Vykresľovať neaktívne vrstvy v iných farbách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhladené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Kresliť čiary medzi raw GPS bodmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6535,9 +6565,9 @@
 "pre kresbu všetkých čiar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "Maximálna dĺžka pre lokálne subary (v metroch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6546,10 +6576,10 @@
 "kreslenie všetkých línií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maximálna dĺžka (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6558,10 +6588,10 @@
 "čiarach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Kresliť smerové šípky pre línie, ktoré spájajú GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6570,5 +6600,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6576,13 +6606,13 @@
 msgstr "Nekreslite šípky ak sa nezmestí do tohoto rozmedzia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Minimálna vzdialenosť (pixelov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovať väčšie bodky pre GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6592,9 +6622,9 @@
 "v  manažéri vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Farby bodov traťových segmentov podľa rýchlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6604,5 +6634,5 @@
 "nahrávacie zariadenie potrebuje pre záznam túto informáciu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -6610,23 +6640,23 @@
 "rýchlostí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Farebná trať a body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Kresliť smer cestného segmentu"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Kresliť poradové čísla všetkých segmentov v rámci cesty."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -6634,109 +6664,130 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovať hranice dát stiahnutých zo servera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovať neaktívne vrstvy dát inou farbou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM údaje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Ponechávať záložné súbory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Pri ukladaní zanechávať záložné súbory končiace znakom ~"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Zobrazovať pri štarte úvodnú obrazovku"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Ukázať ID objektu v zozname výberu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Kresliť rubber-band pomocnú čiaru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Pracovný režim (Potlach štýl)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Nevyžaduje sa zapnutie režimu (potlach štýl práce)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Vzhľad a chovanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Štandardný (Automatická predvoľba)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Povoliť vstavané východzie hodnoty"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Povoliť vstavané východzie hodnoty"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Typ lyžiarskej dráhy"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Nastavenie dostupných pluginov."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Stiahnuť zoznam"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Konfigurovať zariadenie..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr "Pridať JOSM Plugin popis URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Vyber prosím nejakú položku."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr "Upraviť JOSM Plugin popis URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Konfigurovať umiestnenie pluginov"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Nastavenie zobrazenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6744,81 +6795,81 @@
 msgstr "Rôzne nastavenia ovplyvňujúce vzhľad celého programu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Nastavenie pripojenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Nastavenie pripojenia pre OSM server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Nastavenie mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Nastavenie projekcie mapy a interpretácie dát."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Nastavenia zvuku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Nastavenia pre zvukový prehrávač a zvukové značky."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Niektoré nastavenia sa prejavia až po reštartovaní JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Zobrazovať súradnice ako"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Metóda projekcie"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Projekcia mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Metóda projekcie"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Zobrazovať súradnice ako"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Používať proxy server"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonymný"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Nastavenia proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Adresa proxy servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Port proxy servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Užívatelské meno pre proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Heslo pre proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Základná URL pre OSM server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6826,17 +6877,17 @@
 "Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Základná Serverová URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr "OSM užívateľské meno (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6854,77 +6905,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Nastavenie klávesových skratiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Zmena klávesových skratiek manuálne."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Akcia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Skratka"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Popis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Vrstva: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Autori(spracovatelia): {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Pomoc: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Verzia {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Skopírovať východzí"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Vyberte riadok na kopírovanie."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Pridať nový zdroj do zoznamu."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Zmazať vybratý zdroj zo zoznamu."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Menu Sort presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Povoliť vstavané východzie hodnoty"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Zdroj predvolieb značenia (Tagging preset source)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Zdroje (URL alebo meno súboru) súborov s definíciou predvolieb značenia. "
-"Pozrite http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Pridať novýzdroj predvolieb značenia do obsahu."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Zmazať vybratý zdroj zo zoznamu."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Predvoľby značenia (Tagging Presets)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Zdroj predvolieb značenia (Tagging preset source)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Oddeľovač"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Panel nástrojov"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Dostupný"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Úprava panela nástrojov"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Úprava položiek na panely nástrojov."
@@ -7197,6 +7279,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7205,7 +7287,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Súbor {0} existuje. Prepísať ho?"
+msgstr "Súbor \"{0}\" neexistuje"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7213,5 +7295,5 @@
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Rozloženie súboru \"{0}\" neúspešné"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
@@ -7223,4 +7305,6 @@
 msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
 msgstr ""
+"žiadne pôvodné s id {0} v lokálnej dátovej sade. Nemôžem dedukovať typ "
+"pôvodných"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
@@ -7228,4 +7312,5 @@
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr ""
+"Server odpovedal stretol sa s reakcoiu kódu 404 pre id {0}. Vynechanie."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
@@ -7234,4 +7319,6 @@
 "for each primitive"
 msgstr ""
+"Server odpovedal s chybovou kód 404, opakovanie s individuálnou žiadosťou "
+"pre každý pôvodný"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -7534,8 +7621,8 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 "Varovanie: preferencie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
@@ -7548,15 +7635,15 @@
 msgstr "{0}% ({1}/{2}), {3} ostáva. Odosielam {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Aktualizácia pluginov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Stiahnuť pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7569,5 +7656,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7577,23 +7664,23 @@
 msgstr[2] "{0} Pluginov je úspešne stiahnutých. Prosím reštartujte JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Sťahujem Pluginy {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
 msgid "Skip download"
 msgstr "Vynechať sťahovanie"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "JOSM verzia {0} požadovaná pre plugin {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Download Plugin"
 msgstr "Stiahnuť Plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr "Vynechať Sťahovanie"
@@ -7643,6 +7730,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Vypnúť doplnok"
@@ -7657,5 +7744,5 @@
 msgstr "Zachovať plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7665,5 +7752,5 @@
 "ich prepísaniu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7672,10 +7759,10 @@
 "Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Podľa informácie v doplnku jeho autorom je ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7683,9 +7770,9 @@
 "Vyskúšajte aktualizovať plugin na najnovšiu verziu pre nahláseným chyby."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Vypnúť doplnok?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7695,5 +7782,5 @@
 "prestal používať."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7703,19 +7790,19 @@
 "JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Informácia"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "Popis nedostupný"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "Viac detailov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7725,13 +7812,13 @@
 msgstr[2] "Informácie o pluginoch stiahnuté z {0} stránok"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Nenájdené informácie o plugine"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Všetky nainštalované pluginy sú aktuálne."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7744,9 +7831,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Stiahnuť chýbajúca pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7759,6 +7846,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7781,14 +7868,14 @@
 msgstr "neznámy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Verzie {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin je zahrnutý v JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -8047,45 +8134,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Získavam GPS polohu z EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Začínam prehľadávať adresár"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Niektorý z vybratých súborov bol prázdny !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Čítať fotky..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemôžem získať cestu pre adresár {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prehľadávam adresár {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nájdený prázdny súbor v adresári {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Zladiť GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8294,20 +8381,20 @@
 msgstr "Sekúnd: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Zladené {0} z {1} fotiek k GPX stope."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Časový rozdiel z {0} dní)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8317,13 +8404,13 @@
 "posúvač ručne na fotky."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Priraďovanie fotiek ku stope(track) zlyhalo"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Nastaviť časové pásmo a vyváženie(offset)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Východzie hodnoty"
@@ -8345,5 +8432,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Chyba pri nahrávaní súboru"
@@ -8701,5 +8788,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Prázdna vrstva"
@@ -8805,20 +8892,22 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS Súbory (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr "Chybný formát: "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "TangoGPS import úspešný"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "TangoGPS import neúspešný!"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Chyba formátu súboru"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA import úspešný"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "NMEA import zlyhal!"
+msgid "TCX Files (*.tcx)"
+msgstr "TangoGPS Súbory (*.log)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8843,5 +8932,5 @@
 msgstr "Vytvoriť duplikát cesty"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Vrstva na úoravu GPX stôp(tracks)"
@@ -8862,11 +8951,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Importovať cestu z GPX vrstvy"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Zahodiť existujúcu cestu"
@@ -8875,6 +8964,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "GPS dátová vrstva nie je vytvorená."
@@ -8937,6 +9026,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Obnoviť"
@@ -9245,7 +9334,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "voda"
@@ -9560,8 +9649,11 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>Openstreetbus plugin používa starý server v appspot.com.<br>Nový "
+"server je dostupný na schokokeks.org.<br>Chcete prejsť na nový server? "
+"(Veľmi odporúčame)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Prejsť na nový openstreetbugs server?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -9589,14 +9681,14 @@
 "Hlavička obsahuje niekoľko hodnôt a nemôže byť namapovaný jednotlivý reťazec"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Otvoriť OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Otvoriť OpenStreetBugs okno a aktivovať automatické sťahovanie"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9730,19 +9822,19 @@
 msgstr "Povolené činnosti"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požiadavky: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povoliť?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9859,5 +9951,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Flush Tile Cache"
-msgstr ""
+msgstr "Flush Tile Cache"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
@@ -9866,7 +9958,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Nahrávam..."
+msgstr "nahrávam obrázok..."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -10061,13 +10152,4 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "Najskôr určite zdroj predvoľby značenia v predvoľbách."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importovať TCX súbor..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importovať TCX súbor ako GPS trasu"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10281,34 +10363,34 @@
 msgstr "Otvoriť dialógové okno, aby bol umožnený skok na konkrétne miesto"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Vložiť Šírku/Dĺžku pre skok na miesto."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Môžete tiež vložiť nejakú URL z www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zväčšenie (v metroch)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Skok tam"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Skok na miesto (pozíciu)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 "Nemôžem zistiť Šírku, Dĺžku, alebo Zväčšenie(zoom). Prosím skontrolujte to."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Niesom schopný vyčítať Šírku/Dĺžku"
@@ -10627,23 +10709,23 @@
 msgstr "Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Kontrola vlastností :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Tento plugin kontroluje chyby kľúčov a ich hodnôt."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Neplatný tagchecker line - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Neplatný spellcheck line: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10654,5 +10736,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Neplatná kombinácia klúča/hodnoty"
@@ -10660,79 +10742,79 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Problém s vykresľováním"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Klúč ''{0}'' je neplatný."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Klúče s prázdnými hodnotami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Neplatné vlastnosti kľúča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Neplatná medzera vo vlastnosti klúča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Hodnota začíná alebo končí medzerou"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Hodnota obsahuje HTML entitu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Kľúč ''{0}'' nie je predvolený."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "Predvoľba neobsahuje vlastnosti kľúča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Hodnota ''{0}'' pre kľúč ''{1}'' nie je predvolená."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "Predvoľba neobsahuje vlastnost hodnoty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Kontrola vlastností kľúčov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Kontroluje platnosť vlastností kľúčov proti zoznamu slov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Použíť komplexnú kontrolu vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Kontroluje platnosť hodnôt a tagů(značiek) pomocou komplexných pravidel."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "TagChecker source"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10743,74 +10825,84 @@
 "značiek."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Pridať nový zdroj do zoznamu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Upraviť zvolený zdroj."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Zdroje dát"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Kontrola vlastností hodnôt ."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr "Kontroluje platnosť vlastností hodnôt proti prednastaveným hodnotám."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Kontrola pre FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Pohľad pre body, alebo cesty s FIXME v hodnotách vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Kontrola pre poznámky (notes)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Kontrola či pri kreslení mapy nevznikli chyby."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Použite štandardný dátový súbor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Použite štandardný dátový súbor (doporučené)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Použite štandardný dátový súbor."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Použite štandardný dátový súbor (doporučené)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Použite štandardný spellcheck súbor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Použite štandardný spellcheck súbor (doporučené)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Oprava vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Nemôžem nájsť typ elementu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Nemôžem nájsť úroveň varovania."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Neplatný výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10957,7 +11049,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "budovy"
@@ -10971,5 +11063,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "oblasť(plocha)"
@@ -10979,25 +11071,25 @@
 msgstr "Neuzavretá cesta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Nepripojené cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Tento test kontroluje blízkosť koncových bodov ciest k iným cestám"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Koncový bod cesty je blízko inej komunikácie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Koncový bod cesty je blízko inej cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Bod cesty je blízko inej cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Spojený koncový bod cesty je blízko inej cesty"
@@ -11022,17 +11114,22 @@
 msgstr "Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Nepomenované cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Upraviť kruhový objazd"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Neotagované(neoznačené) cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Prázdne cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Cesty s jediným bodom"
@@ -11070,14 +11167,14 @@
 msgstr "Vybrať a spustiť body na konci cesty"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr "Je dosiahnutý koniec línie"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr "Je dosiahnuté spojenie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Nastavenie výnimky"
@@ -11199,5 +11296,5 @@
 msgstr "Nastavte polohu vybratej WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11213,15 +11310,15 @@
 msgstr "Automatické sťahovanie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, 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:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11229,102 +11326,91 @@
 "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Stiahnuť viditeľné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Zmena rozlíšenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Nahrať poškodené dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr "Uložiť WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr "Načítať WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Chyba formátu súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Nastavenie WMS Pluginu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Upraviť obsah WMS serverov zobrazených vo WMS menu pluginu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Meno v menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Meno v menu (východzie)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (východzie)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Zadajte meno v menu a WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Skopírovať východzí"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Vyberte riadok na kopírovanie."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr "Prekryť štvorce (tiles)"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr "% lat:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr "% lon:"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Stiahnuť"
 
 #. *
@@ -11413,5 +11499,5 @@
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Dovoliť import rôzdnych formátov súborov priamo do JOSMu."
 
 #. Plugin DirectUpload
@@ -11574,16 +11660,11 @@
 "jar-súbor rovnako ako samostatne."
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "Priamo nahrať TCX súbory z JOSMu."
-
-#. Plugin terracer
-#: build/trans_plugins.java:61
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytvárať radové domy mimo jednotlivých blokov."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:61
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11595,5 +11676,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11604,5 +11685,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11614,11 +11695,11 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+"Jednoduché sťahovanie pozdĺž dlhej spojenej(set of interconnected) cesty"
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-"Jednoduché sťahovanie pozdĺž dlhej spojenej(set of interconnected) cesty"
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12417,4 +12498,64 @@
 msgstr "Prístup"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "áno"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12438,5 +12579,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "private (len pre vlastníka)"
@@ -12484,5 +12625,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "miesto určenia (cieľ)"
@@ -12519,5 +12660,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "permissive (súhlas vlastníka pozemku)"
@@ -12536,4 +12677,28 @@
 msgid "agricultural"
 msgstr "farmársky (agricultural)"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "nie"
 
 #: build/trans_presets.java:315
@@ -12749,6 +12914,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "dialnica (motorway)"
@@ -12774,6 +12939,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "cesta pre motorové vozidlá (trunk)"
@@ -12799,6 +12964,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "cesta prvej triedy"
@@ -12824,6 +12989,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "cesta druhej triedy"
@@ -12837,5 +13002,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "cesta tretej triedy"
@@ -12853,5 +13018,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "obytná (osídlená)"
@@ -12869,5 +13034,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "obslužná (service)"
@@ -12894,6 +13076,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "konštrukcia"
@@ -12943,5 +13125,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "kruhový objazd (roundabout)"
@@ -13927,5 +14109,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "močiar (marsh)"
@@ -15657,27 +15839,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "šport"
@@ -18520,8 +18702,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "bicykel"
@@ -18590,8 +18772,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "pešia (foot)"
@@ -18617,5 +18799,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metro (subway)"
@@ -18745,4 +18927,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18751,4 +18934,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18757,4 +18941,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18763,4 +18948,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18824,7 +19010,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "most"
@@ -18882,4 +19068,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19005,7 +19192,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -19088,15 +19275,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "zastaralý"
@@ -19138,5 +19325,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "koňská (horse)"
@@ -19346,11 +19533,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr "prekážka"
@@ -19388,6 +19575,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "ulica"
@@ -19443,7 +19630,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "cesta (highway_track)"
@@ -19499,8 +19686,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "koľajnica (rail)"
@@ -19521,5 +19708,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr "služby"
@@ -19533,5 +19720,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr "brod"
@@ -19552,5 +19739,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -19565,5 +19752,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr "miesto pohotovostnej prvej pomoci"
@@ -19578,5 +19765,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "riečny breh"
@@ -19590,5 +19777,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "potok"
@@ -19602,5 +19789,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "dok (nakladacia rampa)"
@@ -19628,5 +19815,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "akvadukt"
@@ -19794,13 +19981,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "človekom vytvorené (manmade)"
@@ -19862,7 +20049,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "železničná výhybka"
@@ -19885,10 +20072,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "iná koľaj"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "nadchod nad železnicou"
@@ -19908,7 +20095,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19916,8 +20106,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "historická železnica(turistická)"
@@ -19962,6 +20156,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "letecké cesty"
@@ -19975,5 +20169,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminál"
@@ -19995,5 +20189,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "zjazdovka_čierna"
@@ -20007,5 +20201,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "zjazdovka_ľahká"
@@ -20053,7 +20247,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "Visuté cesty/Lanovky"
@@ -20070,5 +20264,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "mierna zjazdovka (piste_easy)"
@@ -20083,5 +20277,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "stredne ťažká zjazdovka (piste_intermediate)"
@@ -20096,5 +20290,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "zjazdovka pre pokročilých (piste_advanced)"
@@ -20109,5 +20303,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "zjazdovka pre expertov (piste_expert)"
@@ -20122,5 +20316,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "zjazdovka pre freeride (piste_freeride)"
@@ -20135,5 +20329,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "zjazdovka pre začiatočníkov (piste_novice)"
@@ -20238,10 +20432,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "energia (power)"
@@ -20255,5 +20449,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "hrádza (pier)"
@@ -20267,5 +20461,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "potrubie (pipeline)"
@@ -20393,12 +20587,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -20412,5 +20606,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "prístav (marina)"
@@ -20482,8 +20676,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "zaujímavosti (amenity)"
@@ -20585,10 +20779,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "verejná_doprava"
@@ -20974,22 +21168,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "svetelné zariadenie"
@@ -21021,6 +21215,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "osvetlená_voda (light_water)"
@@ -21081,8 +21275,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "zdravie"
@@ -21435,26 +21629,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "obchod"
@@ -21526,8 +21720,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotel"
@@ -21677,9 +21871,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "cestovanie"
@@ -21751,8 +21945,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "historické"
@@ -21823,8 +22017,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "zelená"
@@ -21838,5 +22032,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "lom"
@@ -21850,5 +22044,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "skládka odpadov (landfill)"
@@ -21870,5 +22064,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -21882,5 +22076,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "les"
@@ -21894,5 +22088,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "farmy"
@@ -21915,5 +22109,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "maloobchody"
@@ -21927,5 +22121,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "závody"
@@ -21939,5 +22133,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "brownfield (opustený priemyselný objekt)"
@@ -21951,5 +22145,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -21963,5 +22157,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "železničný pozemok"
@@ -22018,7 +22212,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "armáda"
@@ -22032,5 +22226,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "cintorín (cemetery)"
@@ -22043,5 +22237,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "vrchol (peak)"
@@ -22056,5 +22250,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "ľadovec (glacier)"
@@ -22068,5 +22262,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "sopka"
@@ -22121,8 +22315,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "prírodné (natural)"
@@ -22136,5 +22330,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "oblasť pokrytá krovím"
@@ -22148,5 +22342,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "vresovisko"
@@ -22160,5 +22354,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "drevo (wood)"
@@ -22172,5 +22366,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "blato (mud)"
@@ -22184,5 +22378,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "pláž (beach)"
@@ -22260,8 +22454,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "trasa (route)"
@@ -22309,7 +22503,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "hranica (boundary)"
@@ -22451,10 +22645,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "miesto"
@@ -22502,6 +22696,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adresa"
@@ -22732,10 +22926,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22743,5 +22937,5 @@
 msgstr "NPE Maps"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22749,105 +22943,145 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "údaje OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Cesta pre cyklistov"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Ulice NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr "Terraserver Topo"
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr "Terraserver Urban"
 
+#~ msgid "Data Layer"
+#~ msgstr "Vrstva údajov"
+
+#~ msgid "Change"
+#~ msgstr "Zmeniť"
+
+#~ msgid "Rotate"
+#~ msgstr "Otočiť"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Prosím vyberte aspoň jeden bod, cestu alebo reláciu(vzťah). Iba práve "
-#~ "nahraté elementy majú zaznamenaný priebeh(history)."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Obnovovanie cesty..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Obnovujem reláciu..."
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Kontrolujem či sú závislosti {0} is gone ..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Ponechať zdroj"
-
-#~ msgid "Delete mine"
-#~ msgstr "Zmazať moje"
+#~ "Projekcia \"{0}\" je navrhnutá iba\n"
+#~ "pre zemepisné šírky medzi 46.1° a 57°.\n"
+#~ "Použite iný projekčný systém, ak nepoužívate\n"
+#~ "francúzsky WMS server.\n"
+#~ "Nenahrávajte žiadne dáta po zobrazení tejto hlášky!"
 
 #~ msgid ""
-#~ "<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>"
+#~ "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 ""
-#~ "<html>OSM pôvodné s id <strong>{0}</strong> bolo vymazané<br>na servery "
-#~ "iným mapérom.<br><br>Click <strong>{1}</strong> pomechať vaše pôvodné a "
-#~ "ignorovať vymazaný stav.<br>Vašemu pôvodnému bode priradené nové id."
-#~ "<br>Click <strong>{2}</strong> prijať stav na servery a vymazať váš "
-#~ "pôvodný stav.<br>Click <strong>{3}</strong> zrušiť.<br>"
+#~ "Projekcia \"{0}\" je navrhnutá iba pre\n"
+#~ "zemepisné šírky medzi 45.7° and 47.9°\n"
+#~ "a zemepisné dĺžky medzi 5.7° and 10.6°.\n"
+#~ "Použite iný projekčný systém ak nepracujete\n"
+#~ "s dátami zo Švajčiarska, alebo Lichtenštajnska.\n"
+#~ "Nenahrávajte žiadne dáta po tejto správe."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konflikty: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Zdroj predvolieb značenia (Tagging preset source)"
 
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "<html>Sú tam <strong>{0}</strong> pôvodné <br>vybrané pre individuálnu "
-#~ "aktualizáciu. Prosím zmenšite výber<br>pre max. {1} pôvodný.</html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Výber je príliš veľký"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať."
+#~ "Zdroje (URL alebo meno súboru) súborov s definíciou predvolieb značenia. "
+#~ "Pozrite http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Pridať novýzdroj predvolieb značenia do obsahu."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Zdroj predvolieb značenia (Tagging preset source)"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importovať TCX súbor..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importovať TCX súbor ako GPS trasu"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "Prekryť štvorce (tiles)"
+
+#~ msgid "% of lat:"
+#~ msgstr "% lat:"
+
+#~ msgid "% of lon:"
+#~ msgstr "% lon:"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Priamo nahrať TCX súbory z JOSMu."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Nahrávam dáta"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Zatiaľ nie je implementované."
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -22855,4 +23089,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Vyriešiť konflikty"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
 
 #~ msgid "{0} object has conflicts:"
@@ -22894,4 +23131,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Vyriešiť {0} konfliktov v {1} objektoch."
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Kľuknite na obnoviť pre aktualizáciu zoznamu"
+
+#~ msgid "Revert"
+#~ msgstr "Vrátiť naspäť"
+
+#~ msgid "Date"
+#~ msgstr "Dátum"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Vrátiť stav všetkých vybratých objektov na verziu vybratú zo zoznamu "
+#~ "histórie."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -23069,4 +23322,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Prosím vyberte aspoň jeden bod, cestu alebo reláciu(vzťah). Iba práve "
+#~ "nahraté elementy majú zaznamenaný priebeh(history)."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -23126,4 +23386,7 @@
 #~ msgstr "Chyba pri nahrávaní z neznámeho dôvodu"
 
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať."
+
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Vyriešte rozpor v poradovom čísle relácie {0}"
@@ -23131,2 +23394,48 @@
 #~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
 #~ msgstr "POZOR: neočakávaná hodnota pre prednosť rozhodnutia konfliktu, got "
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "Obnovovanie cesty..."
+
+#~ msgid "Checking whether node {0} is gone ..."
+#~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..."
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "Obnovujem reláciu..."
+
+#~ msgid "Checking whether primitive {0} is gone ..."
+#~ msgstr "Kontrolujem či sú závislosti {0} is gone ..."
+
+#~ msgid "Keep mine"
+#~ msgstr "Ponechať zdroj"
+
+#~ msgid "Delete mine"
+#~ msgstr "Zmazať moje"
+
+#~ msgid ""
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
+#~ msgstr ""
+#~ "<html>OSM pôvodné s id <strong>{0}</strong> bolo vymazané<br>na servery "
+#~ "iným mapérom.<br><br>Click <strong>{1}</strong> pomechať vaše pôvodné a "
+#~ "ignorovať vymazaný stav.<br>Vašemu pôvodnému bode priradené nové id."
+#~ "<br>Click <strong>{2}</strong> prijať stav na servery a vymazať váš "
+#~ "pôvodný stav.<br>Click <strong>{3}</strong> zrušiť.<br>"
+
+#~ msgid ""
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
+#~ msgstr ""
+#~ "<html>Sú tam <strong>{0}</strong> pôvodné <br>vybrané pre individuálnu "
+#~ "aktualizáciu. Prosím zmenšite výber<br>pre max. {1} pôvodný.</html>"
+
+#~ msgid "Selection too big"
+#~ msgstr "Výber je príliš veľký"
+
+#~ msgid "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"
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 16400)
+++ applications/editors/josm/i18n/po/sl.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-19 21:34+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-27 15:16+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,8 +17,8 @@
 "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-06-27 12:17+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -26,6 +26,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -33,9 +33,10 @@
 msgstr "Pomoč"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -43,22 +44,22 @@
 "strežnik."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Neshranjene spremembe"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -71,12 +72,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -90,7 +91,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -101,32 +102,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "NEZNANO"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "O programu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Prikaži informacije o programu."
@@ -134,10 +135,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -145,25 +146,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Različica {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Zadnja sprememba {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java različica {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Domača stran"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Prijava napak"
@@ -173,5 +175,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -179,27 +181,27 @@
 msgstr "Podrobnosti"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Preberi me"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Različica"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Prispevki"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Vstavki"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "O JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Datoteke ni bilo moč najti."
@@ -213,12 +215,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr ""
@@ -273,5 +274,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr ""
@@ -280,5 +281,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr ""
@@ -286,5 +287,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Razporedi vozliša v krog"
@@ -297,5 +298,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -391,37 +392,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "podatke"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "plast"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "sprejem"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Povečava na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Povečava pogleda na {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -431,9 +432,9 @@
 msgstr "Pogled: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr ""
@@ -521,37 +522,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Ustvari krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Skozi izbrana tri vozlišča ustvari krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr "Prosim, izberite točno tri vozlišča ali pot s tremi vozlišči."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Izbriši"
@@ -601,5 +606,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -706,11 +711,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -721,5 +727,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Napaka"
@@ -729,30 +735,30 @@
 msgstr "Izberite preddoločeno licenco"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Uredi"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -760,19 +766,19 @@
 msgstr "Ponovno naloži"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -787,7 +793,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Prikaže podatke o zgodovini vozlišč in poti OSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
@@ -797,7 +802,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Prikaže podatke o zgodovini vozlišč in poti OSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -856,5 +860,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr ""
@@ -893,10 +897,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#, java-format
+msgid "Move {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
-#, java-format
-msgid "Move {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
@@ -904,5 +908,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Predmetov ni možno prestaviti s tega sveta."
@@ -1093,5 +1097,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1099,26 +1103,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "Dokument ni odprt, zato ni kaj shraniti."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Prazen dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1126,36 +1129,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Shrani datoteko OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Shrani datoteko GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Neznana končnica datoteke."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1205,6 +1208,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Zapri"
@@ -1441,68 +1445,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Pošlji v OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Pošlji vse spremembe na strežnik OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Novi predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Spremenjeni predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Izbrisani predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Pošljem te spremembe?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Ni česa poslati. Najprej pridobite kakšne podatke."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Obstajajo nerazrešeni konflikti. Razrešite jih."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Ni sprememb za pošiljanje."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1516,17 +1520,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1537,10 +1541,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1550,9 +1554,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1562,18 +1566,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1678,24 +1682,15 @@
 msgstr "Surovi podatki GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Sprejem podatkov"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Nič podatkov ni bilo uvoženih."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "Podatki OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Podatkovna plast"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1737,5 +1732,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1836,5 +1831,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb."
@@ -1845,5 +1840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Za prenehanje vrtenja izpustite miškin gumb."
@@ -1859,7 +1854,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1867,9 +1862,9 @@
 msgstr "Izberite"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Izberi, premakni ali zasuči predmete"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1878,5 +1873,28 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Posamezen element"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Premakni"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Izniči"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1885,5 +1903,5 @@
 "najbližjo točko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1900,5 +1918,5 @@
 msgstr "Povečava in premik zemljevida"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2156,35 +2174,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Spremeni"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Izbriši {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Spremeni {0} predmetov"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2196,19 +2206,26 @@
 msgstr[3] "predmeti"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2216,25 +2233,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Izbriši {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Izbriši {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2245,11 +2262,11 @@
 "Izbrišem iz relacije?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2258,10 +2275,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr ""
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2270,20 +2287,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Premakni"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2311,43 +2328,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
+#, java-format
+msgid "RemoveRelationMember {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "odstrani iz izbora"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Zasuk"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+msgid "Rotate {0} {1}"
+msgstr "Izbriši {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Zaporedje"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2443,25 +2466,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "J"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "V"
@@ -2472,5 +2521,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2495,5 +2544,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2600,17 +2649,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2618,16 +2663,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2639,127 +2673,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznana vloga ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgid "No \"from\" way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
-msgid "No \"from\" way found."
+msgid "No \"to\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "besedilo"
@@ -2767,5 +2801,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2793,6 +2827,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "ozadje"
@@ -2802,19 +2836,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2825,29 +2849,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Merkator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, java-format
+msgid "UTM Zone {0}"
 msgstr ""
 
@@ -2860,14 +2878,14 @@
 msgstr "Zaznamka ni bilo mogoče zapisati."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Sporočilo dneva ni na voljo"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -3052,5 +3070,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3112,5 +3129,5 @@
 msgstr "Pomanjšaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr ""
@@ -3144,18 +3161,23 @@
 msgstr "(ni predmeta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "plasti ni na seznamu."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
 msgid "Contacting the OSM server..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
@@ -3215,4 +3237,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3222,4 +3245,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3227,5 +3252,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Člani"
@@ -3421,7 +3447,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3501,4 +3527,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3506,4 +3535,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3513,4 +3543,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3539,7 +3570,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Povezava ni uspela."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3627,7 +3657,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Prosim, vnesite ime kraja."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3700,7 +3729,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "odstrani iz izbora"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3711,9 +3739,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Vloga"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3731,4 +3761,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3752,8 +3784,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3764,7 +3796,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3820,5 +3853,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Ukazna kopica"
@@ -3829,6 +3862,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3839,5 +3872,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3846,36 +3879,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Spori pri zlivanju"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Razreši"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Razreši"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Spori pri zlivanju"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
 msgstr ""
 
@@ -3913,43 +3941,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Zgodovina"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Prikaži zgodovino izbranih predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Predmet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Še ni podprto."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4086,4 +4119,18 @@
 msgid "Add Properties"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Dodaj"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4196,14 +4243,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -4233,179 +4280,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Osnovno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Član"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Pomakni izbranega člana vrstico višje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Dodaj izbrano"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Dodaj kot člane vse trenutno izbrane predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Odstrani izbrano"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Šport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Izbriši izbrani vir iz seznama."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Pomakni izbranega člana vrstico nižje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "da"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Člani: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4440,21 +4410,21 @@
 msgstr "Najprej izberite zaznamek."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4463,5 +4433,5 @@
 "Povezava na www.openstreetmap.org (za sprejem področja sem prilepite URL)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Pravokotno področje"
@@ -4611,665 +4581,41 @@
 msgstr "Številke ploščic"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Točka {0} x {1} nima časovne oznake"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Ni moč najti slik z berljivo časovno oznako."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Berem {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Slike z geografskim položajem"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Začetek GPS sledi: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Konec GPS sledi: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "trenutna razlika: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "razlika časovnih pasov: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "slik"
-msgstr[1] "slika"
-msgstr[2] "sliki"
-msgstr[3] "slike"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} znotraj sledi."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Uskladi uro"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "Slike JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "V datoteki \"{0}\" manjka EXIF čas."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Slika"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Uskladite čas z GPS napravo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Vpisanega časa ni bilo mogoče razpoznati."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "točka GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Prilagodi barvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "V redu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Privzeto"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Izberite barvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Uvozi zvok"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Zvočne datoteke (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Uvozi slike"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Opis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Pretvori v podatkovno plast"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "Sprejmi iz OSM vzdolž te sledi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Sprejmi vse znotraj:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>To dejanje bo zahtevalo {0} ločenih<br>zahtev za sprejem. Ali želite "
-"nadaljevati?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "izven sprejetega področja"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} je sestavljen iz:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} izbrisan.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Pretvori v plast GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "sledi"
-msgstr[1] "sled"
-msgstr[2] "sledi"
-msgstr[3] "sledi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "točk"
-msgstr[1] "točka"
-msgstr[2] "točki"
-msgstr[3] "točke"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "sled z {0} točkami"
-msgstr[1] "sled z {0} točko"
-msgstr[2] "sled z {0} točkama"
-msgstr[3] "sled z {0} točkami"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} točk"
-msgstr[1] "{0} točka"
-msgstr[2] "{0} točki"
-msgstr[3] "{0} točke"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Napredne nastavitve"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Trenutna vrednost je privzeta"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Privzeta vrednost je ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Prosim izberite vrstico za urejanje."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Nova vrednost za {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Prosim izberite vrstico za izbris."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Vpišite nov par ključ/vrednost"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Prikaži meni Zvok"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Barva"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -5979,5 +5325,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6128,40 +5475,726 @@
 msgstr "Naziv"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Točka {0} x {1} nima časovne oznake"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Ni moč najti slik z berljivo časovno oznako."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Berem {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Slike z geografskim položajem"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Začetek GPS sledi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Konec GPS sledi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "trenutna razlika: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "razlika časovnih pasov: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "slik"
+msgstr[1] "slika"
+msgstr[2] "sliki"
+msgstr[3] "slike"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} znotraj sledi."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Uskladi uro"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "Slike JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "V datoteki \"{0}\" manjka EXIF čas."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Slika"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Uskladite čas z GPS napravo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Vpisanega časa ni bilo mogoče razpoznati."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "točka GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Prilagodi barvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "V redu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Privzeto"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Izberite barvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Uvozi zvok"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Zvočne datoteke (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Uvozi slike"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Opis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Pretvori v podatkovno plast"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "Sprejmi iz OSM vzdolž te sledi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Sprejmi vse znotraj:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>To dejanje bo zahtevalo {0} ločenih<br>zahtev za sprejem. Ali želite "
+"nadaljevati?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "izven sprejetega področja"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} je sestavljen iz:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} izbrisan.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Pretvori v plast GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "sledi"
+msgstr[1] "sled"
+msgstr[2] "sledi"
+msgstr[3] "sledi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "točk"
+msgstr[1] "točka"
+msgstr[2] "točki"
+msgstr[3] "točke"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "sled z {0} točkami"
+msgstr[1] "sled z {0} točko"
+msgstr[2] "sled z {0} točkama"
+msgstr[3] "sled z {0} točkami"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} točk"
+msgstr[1] "{0} točka"
+msgstr[2] "{0} točki"
+msgstr[3] "{0} točke"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Napredne nastavitve"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Trenutna vrednost je privzeta"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Privzeta vrednost je ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Prosim izberite vrstico za urejanje."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Nova vrednost za {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Prosim izberite vrstico za izbris."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Vpišite nov par ključ/vrednost"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Prikaži meni Zvok"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr ""
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Barva"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Izberite"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Izberite barvo za {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "Barve različnih predmetov v JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Barve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6170,29 +6203,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Riši velike točke GPS sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hitrost (rdeče = počasi, zeleno = hitro)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enobarvno (barvo poimenovanih plasti je mogoče prilagoditi po meri)"
@@ -6200,5 +6233,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6219,5 +6252,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6255,5 +6288,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6266,50 +6299,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Riši smerne puščice"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Le zanimive smerne puščice (npr enosmerne ceste)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Le na koncu poti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Riši meje sprejetega področja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Riši nedejavne plasti v drugi barvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6317,9 +6350,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6328,25 +6361,25 @@
 "Nastavite '-1' za povezavo vseh točk."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Največja dolžina (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6354,13 +6387,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Najmanjša razdalja (slikovnih točk)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6368,9 +6401,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Barvaj točke in segmente sledi glede na hitrost."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6378,136 +6411,155 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "Točke GPS sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Riši nedejavne podatkovne plasti v drugi barvi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "Podatki OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Ohrani varnostne kopije datotek"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Pri shranjevanju ohrani varnostne kopije s končnico \"~\""
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr ""
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Videz in občutek"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Privzeto (samodejna izbira)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Jezik"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+msgid "Enable built-in icon defaults"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Nastavi razpoložljive vstavke."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Sprejmi seznam"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Posodobi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Nastavi vire vstavkov"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Nastavitve prikaza"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6515,98 +6567,98 @@
 msgstr "Različne nastavitve, ki vplivajo na izgled celotne aplikacije."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Nastavitve povezave"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Nastavitve povezave do strežnika OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Nastavitve zemljevida"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Nastavitve zvoka"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
-msgid "Map Projection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Oblika prikaza koordinat"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
 msgid "Projection method"
 msgstr "Geografska projekcija"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Oblika prikaza koordinat"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
+msgid "Map Projection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Omogoči posredovalni strežnik"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Nastavitve posredovalnega strežnika"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Ime posredovalnega strežnika"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Vrata posredovalnega strežnika"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Uporabniško ime na posredovalnem strežniku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Geslo na posredovalnem strežniku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Osnovni URL naslov strežnika"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM geslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6621,75 +6673,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr ""
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
-msgid "Sort presets menu"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Vir prednastavljenih oznak"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Opis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Plasti: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Zvok: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Opozorilo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Različica {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Privzeto"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
 msgstr "Dodaj nov vir prednastavitev na seznam."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
 msgid "Delete the selected source from the list."
 msgstr "Izbriši izbrani vir iz seznama."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+msgid "Sort presets menu"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Prednastavljene oznake"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Viri prednastavljenih oznak"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Ločilo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Orodjarna"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Prilagoditev orodjarne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Prilagodite si gumbe v orodjarni"
@@ -6941,6 +7026,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7265,5 +7350,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7273,15 +7358,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Posodobitev vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7294,5 +7379,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7301,23 +7386,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7365,6 +7450,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Onemogoči vstavek"
@@ -7379,5 +7464,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7387,5 +7472,5 @@
 "prepisati obstoječe datoteke."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7394,10 +7479,10 @@
 "Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Glede na podatke znotraj vstavka je avtor {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7405,9 +7490,9 @@
 "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Naj vstavek onemogočim?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7417,5 +7502,5 @@
 "njegovo odstranitev iz spomina."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7425,19 +7510,19 @@
 "dobili JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Informacije"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "opis ni na voljo"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7448,13 +7533,13 @@
 msgstr[3] "Sprejeti podatki o vstavkih z  {0} strežnikov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Informacij o vsavku ni bilo mogoče najti."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Vsi nameščeni vstavki so posodobljeni."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7467,9 +7552,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Sprejem manjkajočih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7482,6 +7567,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7504,14 +7589,14 @@
 msgstr "neznan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Različica {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7756,45 +7841,45 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -7993,20 +8078,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8014,13 +8099,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8042,5 +8127,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr ""
@@ -8374,5 +8459,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Prazna plast"
@@ -8479,11 +8564,15 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
 msgid "TangoGPS import success"
-msgstr "Viri prednastavljenih oznak"
+msgstr ""
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
 msgid "TangoGPS import faliure!"
 msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
+#, fuzzy
+msgid "TCX Files (*.tcx)"
+msgstr "Datoteke GPX (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8508,5 +8597,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8527,11 +8616,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8540,6 +8629,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr ""
@@ -8602,6 +8691,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr ""
@@ -8907,7 +8996,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr ""
@@ -9238,14 +9327,14 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+msgid "Open OpenStreetBugs"
+msgstr ""
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-msgid "Open OpenStreetBugs"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9371,19 +9460,19 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9507,7 +9596,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Pošiljanje ..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9695,13 +9783,4 @@
 #: ../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 ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
 msgstr ""
 
@@ -9911,33 +9990,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10243,23 +10322,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Preverjanje lastnosti:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10268,5 +10347,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -10274,78 +10353,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10353,74 +10432,84 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Viri podatkov"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Preveri vrednosti lastnosti."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Uporabi privzeto datoteko."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Uporabi privzeto datoteko (priporočeno)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Uporabi privzeto datoteko."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Uporabi privzeto datoteko (priporočeno)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Uporabi privzeto datoteko za črkovanje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Uporabi privzeto datoteko za črkovanje (priporočeno)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Popravi lastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10565,7 +10654,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "zgradba"
@@ -10579,5 +10668,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr ""
@@ -10587,25 +10676,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10628,17 +10717,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Neimenovane poti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Avtocestno križišče"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr ""
@@ -10676,14 +10770,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr ""
@@ -10781,5 +10875,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10792,117 +10886,106 @@
 msgstr "Samodejno sprejemanje"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Nastavitve WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Spremeni seznam strežnikov WMS, ki so prikazani v meniju WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Naziv v meniju"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "Povezava do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Vpišite ime za meni in povezavo do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Sprejemanje"
 
 #. *
@@ -11114,16 +11197,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11132,5 +11210,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11139,5 +11217,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11146,10 +11224,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -11946,4 +12024,64 @@
 msgstr "Dostop"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "da"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -11967,5 +12105,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr ""
@@ -12013,5 +12151,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr ""
@@ -12048,5 +12186,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12064,4 +12202,28 @@
 #: build/trans_presets.java:623
 msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
 msgstr ""
 
@@ -12278,6 +12440,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr ""
@@ -12303,6 +12465,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "hitra cesta"
@@ -12328,6 +12490,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "glavna"
@@ -12353,6 +12515,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "regionalna"
@@ -12366,5 +12528,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "regionalna (turistična)"
@@ -12382,5 +12544,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr ""
@@ -12398,5 +12560,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr ""
@@ -12423,6 +12602,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr ""
@@ -12472,5 +12651,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "krožišče"
@@ -13449,5 +13628,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr ""
@@ -15178,27 +15357,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "šport"
@@ -18036,8 +18215,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr ""
@@ -18106,8 +18285,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr ""
@@ -18133,5 +18312,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr ""
@@ -18261,4 +18440,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18267,4 +18447,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18273,4 +18454,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18279,4 +18461,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18340,7 +18523,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr ""
@@ -18398,4 +18581,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18521,7 +18705,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18604,15 +18788,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr ""
@@ -18654,5 +18838,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr ""
@@ -18862,11 +19046,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -18904,6 +19088,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr ""
@@ -18959,7 +19143,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -19015,8 +19199,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr ""
@@ -19037,5 +19221,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19049,5 +19233,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19068,5 +19252,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr ""
@@ -19081,5 +19265,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19094,5 +19278,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr ""
@@ -19106,5 +19290,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr ""
@@ -19118,5 +19302,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr ""
@@ -19144,5 +19328,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr ""
@@ -19310,13 +19494,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr ""
@@ -19378,7 +19562,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19401,10 +19585,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19424,7 +19608,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19432,8 +19619,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19478,6 +19669,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19491,5 +19682,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr ""
@@ -19511,5 +19702,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19523,5 +19714,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19569,7 +19760,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr ""
@@ -19586,5 +19777,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19599,5 +19790,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19612,5 +19803,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19625,5 +19816,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19638,5 +19829,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19651,5 +19842,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -19754,10 +19945,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19771,5 +19962,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr ""
@@ -19783,5 +19974,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr ""
@@ -19909,12 +20100,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr ""
@@ -19928,5 +20119,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr ""
@@ -19998,8 +20189,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20101,10 +20292,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20490,22 +20681,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20537,6 +20728,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20597,8 +20788,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr ""
@@ -20951,26 +21142,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr ""
@@ -21042,8 +21233,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr ""
@@ -21193,9 +21384,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr ""
@@ -21267,8 +21458,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr ""
@@ -21339,8 +21530,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21354,5 +21545,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr ""
@@ -21366,5 +21557,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr ""
@@ -21386,5 +21577,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr ""
@@ -21398,5 +21589,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr ""
@@ -21410,5 +21601,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21431,5 +21622,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr ""
@@ -21443,5 +21634,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr ""
@@ -21455,5 +21646,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21467,5 +21658,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21479,5 +21670,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21534,7 +21725,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr ""
@@ -21548,5 +21739,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr ""
@@ -21559,5 +21750,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr ""
@@ -21572,5 +21763,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr ""
@@ -21584,5 +21775,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr ""
@@ -21637,8 +21828,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr ""
@@ -21652,5 +21843,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr ""
@@ -21664,5 +21855,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr ""
@@ -21676,5 +21867,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr ""
@@ -21688,5 +21879,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr ""
@@ -21700,5 +21891,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr ""
@@ -21776,8 +21967,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr ""
@@ -21825,7 +22016,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr ""
@@ -21967,10 +22158,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr ""
@@ -22018,6 +22209,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr ""
@@ -22248,10 +22439,10 @@
 msgstr ""
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr ""
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22259,5 +22450,5 @@
 msgstr ""
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22265,52 +22456,68 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr ""
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "Podatki OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr ""
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Kolesarska steza"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr ""
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr ""
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr ""
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Podatkovna plast"
+
+#~ msgid "Change"
+#~ msgstr "Spremeni"
+
+#~ msgid "Rotate"
+#~ msgstr "Zasuk"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Vir prednastavljenih oznak"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Viri prednastavljenih oznak"
+
 #~ msgid "Uploading data"
 #~ msgstr "Pošiljanje podatkov"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Še ni podprto."
+
 #~ msgid "Email"
 #~ msgstr "E-pošta"
@@ -22318,4 +22525,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Razreši spore"
+
+#~ msgid "Object"
+#~ msgstr "Predmet"
 
 #~ msgid "{0} object has conflicts:"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 16400)
+++ applications/editors/josm/i18n/po/sv.po	(revision 16407)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-26 12:34+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-27 14:56+0000\n"
 "Last-Translator: Konrad Skeri <konrad@skeri.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,31 +32,32 @@
 msgstr "Hjälp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projektion kunde inte hämtas från inställningarna. Använder Mercator."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "Tips: Några av ändringarna härrör från inskickning av nya data till servern."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Osparade ändringar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "Spara och avsluta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "Kassera och avsluta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -69,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -88,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -99,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Hoppar över felaktig URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Hoppar över felaktig URL till en fil: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "OKÄND"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Om"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Visa om-skärmen"
@@ -132,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -143,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "Senast ändrad {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Javaversion {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Buggrapporter"
@@ -171,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -177,27 +179,27 @@
 msgstr "Information"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Läsmig"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Utgåva"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Bidrag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "Om JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Filen kunde inte hittas."
@@ -211,12 +213,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Markera minst en nod eller sträcka."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Varning"
@@ -271,5 +272,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Latitud"
@@ -278,5 +279,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Longitud"
@@ -284,5 +285,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Bilda en cirkel av noderna"
@@ -295,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -381,7 +382,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "Relationskonflikt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -390,37 +390,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "nedhämtad data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zooma till {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zooma det visade till  {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -430,9 +430,9 @@
 msgstr "Visa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Det finns inte något valt att zooma till"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Det finns inte några konflikter att zooma till"
@@ -525,39 +525,43 @@
 msgstr "Välj någonting att kopiera."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Skapa cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Skapa en cirkel av tre valda noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr "De noderna är inte i en cirkel."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 "Välj antingen exakt tre noder eller en sträcka som innehåller exakt tre "
 "noder."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "De noderna är inte i en cirkel."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Ta bort"
@@ -607,5 +611,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -714,11 +718,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -729,5 +734,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Fel"
@@ -737,30 +742,30 @@
 msgstr "Välj en fördefinierad licens"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "Onlinehjälp för JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Öppna i webbläsare"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Redigera"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -768,19 +773,19 @@
 msgstr "Uppdatera"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Fel vid inläsning av sida{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -797,18 +802,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Visa historikinformation om sträckor eller noder i OSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Objektshistorik"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Visa historikinformation om sträckor eller noder i OSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -870,5 +872,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr ""
@@ -907,10 +909,10 @@
 msgstr "höger"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Flytta {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -918,5 +920,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Kan inte flytta objekt utanför världen."
@@ -1113,5 +1115,5 @@
 msgstr "Fil {0} existerar redan. Skriv över?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1121,27 +1123,26 @@
 "in detta som ett fel."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "Dokumentet innehåller inte någon data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "Spara i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1151,36 +1152,36 @@
 "som om du avvisat dem alla. Fortsätt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "Avvisa konflikter och spara"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "Spara OSM-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "Spara GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "Spara Lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Kunde inte backa upp filen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Okänd filändelse."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Det uppstod ett fel när filen skulle sparas."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Det uppstod ett fel när backup-filen skulle återställas."
@@ -1232,6 +1233,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "Stäng"
@@ -1302,11 +1304,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Ett rollbaserat relationsmedlemskap kopierades till alla nya sträckor.\n"
-"Du bör kontrollera detta och rätta till eventuella fel."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1491,68 +1490,68 @@
 msgstr "Tom markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "Skicka in till OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Skicka in alla ändringar till OSM-servern."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Nya objekt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Ändrade objekt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Borttagna objekt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Ge en kort kommentar till de ändringar som du skickar in:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Skicka in dessa ändringar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "Skicka in ändringar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Det finns inte någonting att skicka in. Skaffa lite data först."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Det finns olösta konflikter. Du måste lösa dessa först."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Det finns inte några ändringar att skicka in."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "Ladda Upp"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr "Uppdaterar primitiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synkronisera enbart {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "Synkronisera hela datasetet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1566,17 +1565,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "Konflikt upptäkt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "oförväntat returvärde. Erhöll {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1587,10 +1586,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1600,9 +1599,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1612,18 +1611,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr "Primitiv redan raderad"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "Uppladningen till OSM API misslyckades"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1731,24 +1730,15 @@
 msgstr "Rå GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Hämtar data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "Ingen data importerad."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datalager {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Datalager"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1790,5 +1780,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1891,5 +1881,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Släpp musknappen för att välja objekten i rektangeln."
@@ -1900,5 +1890,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Släpp musknappen för att sluta rotera."
@@ -1916,7 +1906,7 @@
 "därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1924,9 +1914,9 @@
 msgstr "Markera"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Välj, flytta och rotera objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1935,5 +1925,28 @@
 msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Flytta vänster"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Flytta vänster"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Ångra"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1942,5 +1955,5 @@
 "nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1959,5 +1972,5 @@
 msgstr "Zooma och flytta kartan"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2229,35 +2242,27 @@
 msgstr "Fel under kommunikation med servern."
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Lägg till"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Ändra"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Ta bort {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "Ändra {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Ta bort \"{0}\" för {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Sätt {0}={1} för {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2267,19 +2272,26 @@
 msgstr[1] "objekt"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Ta bort \"{0}\" för {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Sätt {0}={1} för {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2287,25 +2299,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Ta bort {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Ta bort {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "Relationskonflikt"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2316,11 +2328,11 @@
 "Ta bort från relationen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "Ta bort från relation"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2331,10 +2343,10 @@
 "Ta bort från relationen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Dela delsträcka"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2346,20 +2358,20 @@
 "använder dem.<br> Vill du verkligen ta bort dem?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Flytta"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2385,44 +2397,50 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "Tog bort element från relation"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "TaBortRelationsMedlem"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Rotera"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Ta bort {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sekvens"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../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:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2519,25 +2537,51 @@
 msgstr "Kunde inte hämta inställningar från server."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "Ö"
@@ -2548,5 +2592,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2571,5 +2615,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2668,17 +2712,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2686,16 +2726,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2707,127 +2736,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "En sträcka för en yta är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygonsträckan ''{0}'' är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Tog bort medlemmen ''{0}'' i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Sträcka \"{0} med mindre än två punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 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:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 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:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "Mer än en \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Okänd roll ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, 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:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 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:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "Det finns inte någon \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 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:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 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:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 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:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 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:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 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:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stil för restriktion {0} kunde inte hittas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Icke-sträcka ''{0}'' i multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygonen ''{0}'' saknar yttre sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Den inre sträckan ''{0}'' befinner sig utanför."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil för yttre väg ''{0}'' passar inte."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "otaggade"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "text"
@@ -2835,5 +2864,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2861,6 +2890,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "bakgrund"
@@ -2870,24 +2899,9 @@
 msgstr "framhäv"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Projektionen \"{0}\" är enbart avsedd\n"
-"för latituder mellan 46,1° och 57°.\n"
-"Använd ett annat projektionsystem om du\n"
-"inte använder en fransk WMS-server.\n"
-"Skicka inte in några data efter du har fått detta meddelande."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2903,30 +2917,24 @@
 "och börja på ett nytt lager i den nya zonen."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambertzon (Frankrike)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertzon (Estland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Flytta {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2938,14 +2946,14 @@
 msgstr "Kunde inte skriva bokmärken."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Dagens meddelande är inte tillgängligt"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- nuvarande version är {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "Hämtar \"Dagens meddelande\""
@@ -3139,5 +3147,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3199,5 +3206,5 @@
 msgstr "Zooma ut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skala"
@@ -3231,8 +3238,13 @@
 msgstr "(inget objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "lagret finns inte i listan."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3240,9 +3252,9 @@
 msgstr "Ansluter till OSM-servern"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Fel vid tolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Filen hittades inte"
@@ -3302,4 +3314,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3309,4 +3322,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3314,5 +3329,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Medlemmar"
@@ -3508,7 +3524,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3588,4 +3604,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3593,4 +3612,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3600,4 +3620,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3619,14 +3640,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "Fel under kommunikation med servern."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Fel under kommunikation med servern."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3708,17 +3728,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
-#, fuzzy
 msgid "visible (on the server)"
-msgstr "Primitiv raderad på servern"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
-#, fuzzy
 msgid "not visible (on the server)"
-msgstr "Primitiv raderad på servern"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Ange platsens namn."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3755,13 +3772,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "Ja, återskapa dem också"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Inget datum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3793,7 +3808,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "ta bort från urval"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3804,9 +3818,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Roll"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3824,4 +3840,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3845,8 +3863,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3857,7 +3875,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3913,5 +3932,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Kommandolista"
@@ -3922,6 +3941,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3932,5 +3951,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3939,10 +3958,28 @@
 msgstr "Växla: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Kommandolista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Jämkar konflikter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Jämka"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Öppna en sammanfogningsdialog med alla de valda posterna från listan ovan."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3951,27 +3988,4 @@
 msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Jämka"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Öppna en sammanfogningsdialog med alla de valda posterna från listan ovan."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Jämkar konflikter"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Konflikter: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -4007,45 +4021,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Klicka på Uppdatera för att uppdatera listan"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Historik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Visa historik för alla valda poster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Datum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Läs om alla de nu valda objekten och uppdatera listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Återgå"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Återställ alla de nu valda objekten till den version som valts i "
-"historiklistan."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Inte implementerat ännu."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4178,4 +4195,18 @@
 msgid "Add Properties"
 msgstr "Lägg till egenskaper"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Lägg till"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4288,9 +4319,9 @@
 msgstr "Urval: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Lossa panelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4299,5 +4330,5 @@
 "vänstra verktygraden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicka för att minimera/maximera panelens innehåll"
@@ -4327,179 +4358,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "Verkställ ändringar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Innehas av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Taggar (tomt värde tar bort taggen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "Flytta uppåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Flytta vald medlem/valda medlemmar uppåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Lägg till vald"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "Ta bort det valda"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "Ta bort alla för närvarande valda objekt från relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Ta bort vald källa från listan."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "Flytta nedåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Flytta vald medlem/valda medlemmar nedåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Hämta medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hämta alla ofullständiga sträckor och noder i relationen"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "ja"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "nej"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Medlemmar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relationsredigerare:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "Konflikter upptäcktes under import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Fel vid inläsning av serverns svar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Kan inte ansluta till server."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4534,21 +4488,21 @@
 msgstr "Välj ett bokmärke först."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4558,5 +4512,5 @@
 "hem området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Gränsvärden"
@@ -4706,679 +4660,41 @@
 msgstr "Rutnummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "Bilder för {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "Läs in GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Tid saknas för punkt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Inga bilder med läsbara tidsangivelser hittades."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "Läser {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Geotaggade bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS startpunkt: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS slutpunkt: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "nuvarande delta: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "tidsskillnad: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "bild"
-msgstr[1] "bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} inom spåret."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Synka klocka"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-bilder (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Datum i fil \"{0}\" kunde inte tolkas."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Bild"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Tidszon för GPS-enhet (skillnad mot foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synkronisera Tid med GPS-enheten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Angiven tid kunde inte tolkas."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps-punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Anpassa linjeritning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Använd globala inställningar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Välj alternativ för linjeritning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Anpassa färger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Välj en färg"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "Markörer från namngivna punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Namngivna spårpunkter från {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Importera ljud"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-ljudfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Ljudmarkörer från {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Importera bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} spår, "
-msgstr[1] "{0} spår, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rutt, "
-msgstr[1] "{0} rutter, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} sträckpunkt"
-msgstr[1] "{0} sträckpunkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "Namn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivning: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Tidsomfång: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Längd: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Omvandla till datalager"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Det anses skadligt att skicka in obehandlad GPS-data.<br>Om du vill "
-"skicka in spår, se här:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Omvandlad från:{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-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:721
-msgid "Download everything within:"
-msgstr "Hämta allting inom:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} meter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Största tillåtna område per begäran:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km2"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>För att utföra detta så kommer {0} separata<br>hämtningar att begäras. "
-"Önskar du<br>fortsätta?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Några sträckpunkter med tidsstämplar tidigare än spårets början eller senare "
-"än dess slut uteslöts eller flyttades till början."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Några sträckpunkter som låg för långt från spåret för att deras tid skulle "
-"kunna uppskattas med någon rimlighet uteslöts."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "utanför hämtat område"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} består av:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} raderad.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "Omvandla till gpx-lager"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "spår"
-msgstr[1] "spår"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "punkt"
-msgstr[1] "punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "ett spår med {0} punkt"
-msgstr[1] "ett spår med {0} punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} består av {1} spår"
-msgstr[1] "{0} består av {1} spår"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "gps-markör"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "markör"
-msgstr[1] "markörer"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} består av {1} markör"
-msgstr[1] "{0} består av {1} markörer"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Synkronisera ljud"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Ljud synkroniserat vid punkt {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-msgid "Make Audio Marker at Play Head"
-msgstr "Skapa ljudmarkör vid spelhuvud"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr ""
-"Du måste ha pausat ljudet vid den punkt på spåret där du vill placera "
-"markören."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Du måste SKIFT-Dra spelhuvudet upp på en ljudmarkör eller upp på den "
-"spårpunkt där du vill synkronisera."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Kunde inte skapa ny ljudmarkör."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Fel uppstod vid visning av URL:en för denna markör."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL:en var: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Fel vid visning av URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "Avancerade inställningar"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Ange inställningar direkt. Använd med försiktighet!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "Sök: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Nuvarande värde är förval."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Nuvarande värde är ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Förvalt värde är för närvarande okänt (inställningen har inte använts än)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Välj vilken rad du vill ändra."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "Nytt värde för {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Välj vilken rad du vill ta bort."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Ange ett nytt nyckel/värde-par"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Visa ljudmenyn"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Sätt etikett på markörer för ljud (och bild och webb)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Visa live-ljudspår."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "Skapa icke-ljudsmarkörer vid läsning av GPX."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Explicita sträckpunkter med giltiga tidsstämplar."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Explicita sträckpunkter med tid uppskattad från position längs spåret."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "Namngivna spårpunkter."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "Ändrade tidpunkter (tidsstämplar) från ljudfiler."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "Början av spåret (görs alltid om det inte finns andra markörer)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Visa eller dölj ljudmenyn på huvudmenyn."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"Visa en rörlig ikon som representerar den punkt på det synkroniserade spåret "
-"där det ljud som spelas upp samtidigt spelades in."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"Sätt ut textetiketter vid markörer för ljud (och bild och webb) utöver deras "
-"knappikoner."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Skapa vid öppning av ett GPX-lager automatiskt ett markörlager från "
-"tillgängliga sträckpunkter."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Vid import av ljud, skapa markörer från..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-"Vid ljudimport, tillämpa ljud på tillgängliga sträckpunkter i GPX-lagret."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Skapa automatiskt ljudmarkörer från spårpunkter (snarare än explicita "
-"sträckpunkter) med namn och beskrivningar."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"Antal sekunder att hoppa framåt eller bakåt när knapparna i fråga trycks ner"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "Tid framåt/bakåt (sekunder)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Hur många gånger hastigheten fördubblas vid snabbspolning framåt"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Multiplikator för snabbspolning framåt"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Uppspelning påbörjas detta antal sekunder före (eller efter om negativt "
-"värde) begärd position på ljudspåret"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Inledningstid (sekunder)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-"Förhållandet mellan tid förfluten i ljudinspelaren och verklig förfluten tid."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Kalibrering av röstinspelare"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Färg"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6088,5 +5404,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6237,40 +5554,740 @@
 msgstr "Namn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "Bilder för {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "Läs in GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Tid saknas för punkt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Inga bilder med läsbara tidsangivelser hittades."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "Läser {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Geotaggade bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS startpunkt: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS slutpunkt: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "nuvarande delta: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "tidsskillnad: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "bild"
+msgstr[1] "bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} inom spåret."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Synka klocka"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-bilder (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Datum i fil \"{0}\" kunde inte tolkas."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Bild"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Tidszon för GPS-enhet (skillnad mot foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synkronisera Tid med GPS-enheten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Angiven tid kunde inte tolkas."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps-punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Anpassa linjeritning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Använd globala inställningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Välj alternativ för linjeritning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Anpassa färger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Välj en färg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "Markörer från namngivna punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Namngivna spårpunkter från {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Importera ljud"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-ljudfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Ljudmarkörer från {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Importera bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} spår, "
+msgstr[1] "{0} spår, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rutt, "
+msgstr[1] "{0} rutter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} sträckpunkt"
+msgstr[1] "{0} sträckpunkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "Namn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Tidsomfång: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Längd: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Omvandla till datalager"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Det anses skadligt att skicka in obehandlad GPS-data.<br>Om du vill "
+"skicka in spår, se här:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Omvandlad från:{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+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:712
+msgid "Download everything within:"
+msgstr "Hämta allting inom:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} meter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Största tillåtna område per begäran:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km2"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>För att utföra detta så kommer {0} separata<br>hämtningar att begäras. "
+"Önskar du<br>fortsätta?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Några sträckpunkter med tidsstämplar tidigare än spårets början eller senare "
+"än dess slut uteslöts eller flyttades till början."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Några sträckpunkter som låg för långt från spåret för att deras tid skulle "
+"kunna uppskattas med någon rimlighet uteslöts."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datalager {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "utanför hämtat område"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} består av:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} raderad.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "Omvandla till gpx-lager"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "spår"
+msgstr[1] "spår"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punkt"
+msgstr[1] "punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "ett spår med {0} punkt"
+msgstr[1] "ett spår med {0} punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} består av {1} spår"
+msgstr[1] "{0} består av {1} spår"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "gps-markör"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "markör"
+msgstr[1] "markörer"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} består av {1} markör"
+msgstr[1] "{0} består av {1} markörer"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Synkronisera ljud"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Ljud synkroniserat vid punkt {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+msgid "Make Audio Marker at Play Head"
+msgstr "Skapa ljudmarkör vid spelhuvud"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Du måste ha pausat ljudet vid den punkt på spåret där du vill placera "
+"markören."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Du måste SKIFT-Dra spelhuvudet upp på en ljudmarkör eller upp på den "
+"spårpunkt där du vill synkronisera."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Kunde inte skapa ny ljudmarkör."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Fel uppstod vid visning av URL:en för denna markör."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL:en var: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Fel vid visning av URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Avancerade inställningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Ange inställningar direkt. Använd med försiktighet!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "Sök: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Nuvarande värde är förval."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Nuvarande värde är ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Förvalt värde är för närvarande okänt (inställningen har inte använts än)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Välj vilken rad du vill ändra."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "Nytt värde för {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Välj vilken rad du vill ta bort."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Ange ett nytt nyckel/värde-par"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Visa ljudmenyn"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Sätt etikett på markörer för ljud (och bild och webb)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Visa live-ljudspår."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Skapa icke-ljudsmarkörer vid läsning av GPX."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Explicita sträckpunkter med giltiga tidsstämplar."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Explicita sträckpunkter med tid uppskattad från position längs spåret."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Namngivna spårpunkter."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Ändrade tidpunkter (tidsstämplar) från ljudfiler."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "Början av spåret (görs alltid om det inte finns andra markörer)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Visa eller dölj ljudmenyn på huvudmenyn."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Visa en rörlig ikon som representerar den punkt på det synkroniserade spåret "
+"där det ljud som spelas upp samtidigt spelades in."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Sätt ut textetiketter vid markörer för ljud (och bild och webb) utöver deras "
+"knappikoner."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Skapa vid öppning av ett GPX-lager automatiskt ett markörlager från "
+"tillgängliga sträckpunkter."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Vid import av ljud, skapa markörer från..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+"Vid ljudimport, tillämpa ljud på tillgängliga sträckpunkter i GPX-lagret."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Skapa automatiskt ljudmarkörer från spårpunkter (snarare än explicita "
+"sträckpunkter) med namn och beskrivningar."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Antal sekunder att hoppa framåt eller bakåt när knapparna i fråga trycks ner"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Tid framåt/bakåt (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "Hur många gånger hastigheten fördubblas vid snabbspolning framåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Multiplikator för snabbspolning framåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Uppspelning påbörjas detta antal sekunder före (eller efter om negativt "
+"värde) begärd position på ljudspåret"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Inledningstid (sekunder)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+"Förhållandet mellan tid förfluten i ljudinspelaren och verklig förfluten tid."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Kalibrering av röstinspelare"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Färg"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Ritstil{0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "Lager: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Välj"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Välj en färg för {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "Sätt till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "Sätt allt till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "De färger som används av olika objekt i JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6279,29 +6296,29 @@
 msgstr "Alla"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Lokala filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Inget"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Tvinga linjer om inga segment importerats."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Rita stora GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet (röd = långsam, grön = snabb)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "En enda färg (kan anpassas för namngivna lager)"
@@ -6309,5 +6326,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6328,5 +6345,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6364,5 +6381,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6375,16 +6392,16 @@
 msgstr "Fotgängare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Rita riktningspilar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Snabb ritning (ser sämre ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -6393,34 +6410,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Enbart på en sträckas huvud."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Rita ut segmentens ordningsnummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Rita gränser för hämtade data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Rita virtuella noder i urvalsläge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Rita inaktiva lager i avvikande färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Mjuk kartgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "Rita linjer mellan råa GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6428,9 +6445,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6439,10 +6456,10 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maxlängd (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -6451,10 +6468,10 @@
 "linjeinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Rita riktningspilar för linjer, som förbinder GPS-punkter"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -6463,5 +6480,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6471,13 +6488,13 @@
 "senast ritade pil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Minimiavstånd (pixlar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "Rita större punkter för GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6487,9 +6504,9 @@
 "hjälp av lagerhanteraren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "Färglägg punkter och spåravsnitt baserat på hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6497,37 +6514,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "Spår- och punktfärgläggning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Rita riktningsanvisningar för delsträckor."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Rita ordningsnummer för alla delsträckor inom deras sträcka."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Använd antialiasing för att ge kartan ett jämnare utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rita gränser för data hämtade från servern."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -6535,99 +6552,120 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Rita de inaktiva datalagren i avvikande färg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Behåll backup-filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "När man sparar, behåll backup-filer som slutar på ~"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Visa startbild vid uppstart"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Visa objektens ID i urvalslistor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "Rita gummibandshjälplinjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "Arbeta utan lägen (Potlatch-stil)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Kräv inte att man byter läge (arbetsflöde som i Potlatch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Utseende och känsla"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Förval (automatiskt satt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Aktivera inbyggda förval"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Aktivera inbyggda förval"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "Skidspårstyp"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Ställ in tillgängliga insticksmoduler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "Hämta lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Uppdatera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Konfigurera hämtställen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Välj en post."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Konfigurera hämtställen för insticksmoduler"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Visningsinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6636,82 +6674,82 @@
 "Olika inställningar som påverkar hur hela programmet representeras visuellt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Anslutningsinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "Anslutningsinställningar för OSM-servern"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Kartinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Inställningar för kartprojektion och datatolkning."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Ljudinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Inställnignar för ljudspelare och ljudmarkörer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 "Du behöver starta om JOSM för att vissa inställningar skall slå igenom."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "Visa koordinater som"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Projektionsmetod"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Kartprojektion"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Projektionsmetod"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "Visa koordinater som"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Aktivera proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Proxyinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Värd för proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Port för proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Användarnamn för proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Lösenord för proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Bas-URL för OSM-servern (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -6719,17 +6757,17 @@
 "Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Bas-URL för servern"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM-lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6744,78 +6782,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Inställningar för kortkommandon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Ändra kortkommandon manuellt."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Åtgärd"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Kortkommando"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Beskrivning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Lager: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Upphovsmän: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Hjälp: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Kopiera förval"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Välj vilken rad du vill kopiera."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Lägg till en ny källa till listan."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "Ta bort vald källa från listan."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "Sortera snabbvalsmenyn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Aktivera inbyggda förval"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "Källa till snabbval för taggning"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Källorna (URL eller filnamn) till de filer i vilka snabbval för taggning "
-"definieras. Se http://josm.openstreetmap.de/wiki/TaggingPresets för mer "
-"information."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-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."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "Ta bort vald källa från listan."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Snabbval för taggning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Källor för snabbval för taggning"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Avgränsare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Verktygsrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Inställning av verktygsrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Bestäm vad som skall finnas på verktygsraden."
@@ -7093,6 +7161,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7101,7 +7169,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "Fil {0} existerar redan. Skriv över?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7417,5 +7485,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7425,15 +7493,15 @@
 msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Uppdatera insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "Hämta insticksprogram"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7447,5 +7515,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7454,23 +7522,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7522,6 +7590,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Avaktivera insticksmodul"
@@ -7538,5 +7606,5 @@
 msgstr "Behåll plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7546,5 +7614,5 @@
 "JOSM har behörighet att skriva över de existerande."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7553,10 +7621,10 @@
 "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Enligt information inifrån insticksmodulen är dess upphovsman {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7565,9 +7633,9 @@
 "innan du rapporterar en bugg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Skall insticksmodulen avaktiveras?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7577,5 +7645,5 @@
 "frigöra insticksmodulen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7585,19 +7653,19 @@
 "JOSM från."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "ingen beskrivning tillgänglig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7606,13 +7674,13 @@
 msgstr[1] "Hämtade information om insticksmoduler från {0} ställen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Kunde inte hitta någon information om insticksmoduler."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Alla installerade insticksmoduler är av senaste version."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7625,9 +7693,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Hämta saknade insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7640,6 +7708,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7662,14 +7730,14 @@
 msgstr "okänd"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Insticksmodul som medföljer JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7929,45 +7997,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extraherar GPS-plats från EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Påbörjar foldergenomläsning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "En av de valda filerna var null !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Läs in foton..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Läser igenom folder {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "Korrelerar med GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8178,20 +8246,20 @@
 msgstr "Sekunder: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "Parade ihop {0} av {1} foton med GPX-spåret"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Tidsdifferens om {0} dagar)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Förskjutning mellan spår och foton: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8199,13 +8267,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "Matchning av fotografier mot spår misslyckades"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "Justera tidszon och tidsförskjutning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "Standardinställningar"
@@ -8227,5 +8295,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
@@ -8567,5 +8635,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Tomt lager"
@@ -8670,17 +8738,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Fel filformat"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "Import från NMEA genomförd"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "Import från NMEA misslyckades!"
+msgid "TCX Files (*.tcx)"
+msgstr "GPX-filer"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8705,5 +8775,5 @@
 msgstr "Skapa en dubblett av sträcka"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "Lager för editering av GPX-spår"
@@ -8724,11 +8794,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Importera sträckning från GPX-lager"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Glöm existerande sträckning"
@@ -8737,6 +8807,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "Inget GPX-datalager kunde hittas."
@@ -8799,6 +8869,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Uppdatera"
@@ -9107,7 +9177,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "vatten"
@@ -9451,14 +9521,14 @@
 "Huvudet innehåller flera värden och kan inte mappas till en enda sträng"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "Öppna OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9591,19 +9661,19 @@
 msgstr "Tillåtna handlingar"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaljer om begäran: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Vill du tillåta detta?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9727,7 +9797,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Skickar in..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9921,13 +9990,4 @@
 msgstr ""
 "Du måste först ange källor för snabbval för taggning i inställningarna."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "Importera TCX-fil..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "Importera TCX-fil som GPS-spår"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10144,34 +10204,34 @@
 msgstr "Öppnar en dialogruta som gör att man kan gå direkt till en viss plats"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Ange lat/lon för att gå direkt till plats."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Du kan också klistra in en URL från www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "Zoomnivå (meter)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "Gå direkt dit"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "Gå direkt till plats"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 "Kunde inte tolka latitude, longitude eller zoomnivå. Kontrollera värdena."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "Kunde inte tolka lon/lat"
@@ -10493,23 +10553,23 @@
 "felstavning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Egenskapskontrollerare:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Denna insticksmodul letar efter fel i egenskapsnycklar och -värden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ogiltig taggkontrollsrad - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ogiltig rättstavningsrad: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10520,5 +10580,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Ogiltig kombination av nyckel och värde"
@@ -10526,78 +10586,78 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Ritningsproblem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Nyckeln ''{0}'' är ogiltig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Taggar med tomma värden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Ogiltig egenskapsnyckel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Egenskapsnyckel innehåller ogiltigt blanksteg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Egenskapsvärdet börjar eller slutar med blanksteg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Det finns en HTML-markör i egenskapsvärdet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXME-taggar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Kontrollera egenskapsnycklar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Validera egenskapsnycklar genom att kontrollera mot en lista av ord."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Använd komplicerad egenskapskontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr "Validera egenskapsvärden och taggar med hjälp av komplicerade regler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Källa för TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10608,76 +10668,86 @@
 "taggkontrollera datafiler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Lägg till en ny källa till listan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Redigera vald källa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Datakällor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Kontrollera egenskapsvärden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 "Validera att egenskapsvärden är giltiga genom kontroll mot förinställningar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Leta efter FIXME-taggar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 "Letar efter noder och sträckor som har texten FIXME i något egenskapsvärde."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Kontrollera om det finns ritningsanmärkningar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Kontrollera om problem uppstod vid ritning av kartan"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Använd förvald datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Använd den förvalda datafilen (rekommenderas)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Använd förvald datafil."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Använd den förvalda datafilen (rekommenderas)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Använd förvalda rättstavningsfil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Använd den förvalda rättstavningsfilen (rekommenderas)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Rätta till egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Kunde inte hitta elementtyp"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Kunde inte hitta varningsnivå"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ogiltigt uttryck ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10822,7 +10892,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "byggnad (building)"
@@ -10836,5 +10906,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "yta (area)"
@@ -10844,9 +10914,9 @@
 msgstr "Ej stängd sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Ej anslutna sträckor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -10854,17 +10924,17 @@
 "annan sträcka."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Slutnod nära annan väg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Slutnod nära annan sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Nod på sträcka nära annan sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Slutnod på sträcka nära annan sträcka"
@@ -10891,17 +10961,22 @@
 "en enda nod."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "Sträckor utan namn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Redigera en korsning"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Sträckor utan tagg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Tomma sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Ennodssträckor"
@@ -10941,14 +11016,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "Undantag inträffade"
@@ -11046,5 +11121,5 @@
 msgstr "Justera valt WMS-lagers läge"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -11057,118 +11132,107 @@
 msgstr "Automatisk hämtning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, 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:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 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:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Hämta de rutor som syns"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Fel filformat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "Inställningar för WMS-insticksmodulen"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+"Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen"
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-"Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Menynamn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Menynamn (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS-url (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Ange ett menynamn och en URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Kopiera förval"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Välj vilken rad du vill kopiera."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "Hämta"
 
 #. *
@@ -11384,16 +11448,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11402,5 +11461,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11409,5 +11468,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11416,10 +11475,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12216,4 +12275,64 @@
 msgstr ""
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "ja"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12237,5 +12356,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "privat"
@@ -12283,5 +12402,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "mål"
@@ -12318,5 +12437,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "med tillåtelse"
@@ -12335,4 +12454,28 @@
 msgid "agricultural"
 msgstr "jordbruksfordon"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "nej"
 
 #: build/trans_presets.java:315
@@ -12548,6 +12691,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "motorväg"
@@ -12573,6 +12716,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "stamväg"
@@ -12598,6 +12741,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "primärväg"
@@ -12623,6 +12766,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "sekundärväg"
@@ -12636,5 +12779,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "tertiärväg"
@@ -12652,5 +12795,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "bostadsgata"
@@ -12668,5 +12811,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "tillfartsväg"
@@ -12693,6 +12853,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "under byggnad"
@@ -12742,5 +12902,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "rondell"
@@ -13719,5 +13879,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "kärr"
@@ -15448,27 +15608,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "sport"
@@ -18306,8 +18466,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "cykel"
@@ -18376,8 +18536,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "fot"
@@ -18403,5 +18563,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "tunnelbana"
@@ -18531,4 +18691,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18537,4 +18698,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18543,4 +18705,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18549,4 +18712,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18610,7 +18774,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "bro"
@@ -18668,4 +18832,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18791,7 +18956,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18874,15 +19039,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "förlegad"
@@ -18924,5 +19089,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "häst"
@@ -19132,11 +19297,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -19174,6 +19339,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "gata"
@@ -19229,7 +19394,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "landsvägsspår"
@@ -19285,8 +19450,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "räls"
@@ -19307,5 +19472,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19319,5 +19484,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19338,5 +19503,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "vändplats"
@@ -19351,5 +19516,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19364,5 +19529,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "flodbank"
@@ -19376,5 +19541,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "bäck"
@@ -19388,5 +19553,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "hamn"
@@ -19414,5 +19579,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "akvedukt"
@@ -19580,13 +19745,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "byggnadsverk"
@@ -19648,7 +19813,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "järnvägspunkt"
@@ -19671,10 +19836,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19694,7 +19859,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19702,8 +19870,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19748,6 +19920,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19761,5 +19933,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminal"
@@ -19781,5 +19953,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19793,5 +19965,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19839,7 +20011,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "linbana"
@@ -19856,5 +20028,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19869,5 +20041,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19882,5 +20054,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19895,5 +20067,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19908,5 +20080,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19921,5 +20093,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -20024,10 +20196,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "kraft"
@@ -20041,5 +20213,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "pir"
@@ -20053,5 +20225,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "rörledning"
@@ -20179,12 +20351,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "fritid"
@@ -20198,5 +20370,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "marina"
@@ -20268,8 +20440,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "inrättning"
@@ -20371,10 +20543,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "trafikinrättning"
@@ -20760,22 +20932,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20807,6 +20979,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20867,8 +21039,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "hälsa"
@@ -21221,26 +21393,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "affär"
@@ -21312,8 +21484,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotell"
@@ -21463,9 +21635,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turism"
@@ -21537,8 +21709,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "historisk"
@@ -21609,8 +21781,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21624,5 +21796,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "stenbrott"
@@ -21636,5 +21808,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr ""
@@ -21656,5 +21828,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "hamnbassäng"
@@ -21668,5 +21840,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "skog"
@@ -21680,5 +21852,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21701,5 +21873,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "detaljhandel"
@@ -21713,5 +21885,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "industri"
@@ -21725,5 +21897,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21737,5 +21909,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21749,5 +21921,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21804,7 +21976,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "militär"
@@ -21818,5 +21990,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "begravningsplats"
@@ -21829,5 +22001,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "topp"
@@ -21842,5 +22014,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "glaciär"
@@ -21854,5 +22026,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "vulkan"
@@ -21907,8 +22079,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "naturfenomen"
@@ -21922,5 +22094,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "buskage"
@@ -21934,5 +22106,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "hed"
@@ -21946,5 +22118,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "skog"
@@ -21958,5 +22130,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "lera"
@@ -21970,5 +22142,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "strand"
@@ -22046,8 +22218,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "rutt"
@@ -22095,7 +22267,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "gräns"
@@ -22237,10 +22409,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "plats"
@@ -22288,6 +22460,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adress"
@@ -22518,10 +22690,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Open Aerial Map"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22529,5 +22701,5 @@
 msgstr "NPE-kartor"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22535,104 +22707,119 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap-data"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Cykelbana"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Datalager"
+
+#~ msgid "Change"
+#~ msgstr "Ändra"
+
+#~ msgid "Rotate"
+#~ msgstr "Rotera"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "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 ""
-#~ "Välj åtminstone en nod, sträcka eller relation. Endast objekt som redan "
-#~ "skickats in har en historik."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Ångrar radering av väg..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Kontrollerar huruvida nod {0} är borta..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Återskapar relation..."
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Kontrollerar huruvida primitiv {0} är borta..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Behåll mina"
-
-#~ msgid "Delete mine"
-#~ msgstr "Radera mina"
+#~ "Projektionen \"{0}\" är enbart avsedd\n"
+#~ "för latituder mellan 46,1° och 57°.\n"
+#~ "Använd ett annat projektionsystem om du\n"
+#~ "inte använder en fransk WMS-server.\n"
+#~ "Skicka inte in några data efter du har fått detta meddelande."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konflikter: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Källa till snabbval för taggning"
 
 #~ 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>"
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "<html>OSM primitiv id <strong>{0}</strong> har raderats på servern<br>av "
-#~ "en annan kartograf.<br><br>Klicka <strong>{1}</strong> för att behålla "
-#~ "ditt primitiv och ignorera det raderade tillståndet.<br>Ditt primitiv "
-#~ "kommer att tilldelas ett nytt id.<br>Klicka <strong>{2}</strong> för att "
-#~ "acceptera det nya tillståndet på servern och radera ditt primitiv."
-#~ "<br>Klicka <strong>{3}</strong> för att avbryta.<br>"
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Det finns <strong>{0}</strong> primitiv<br>markerade för "
-#~ "individuell uppdatering. Vänligen reducera<br>urvalet till max {1} "
-#~ "primitiv.</html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Markering för stor"
+#~ "Källorna (URL eller filnamn) till de filer i vilka snabbval för taggning "
+#~ "definieras. Se http://josm.openstreetmap.de/wiki/TaggingPresets för mer "
+#~ "information."
+
+#~ msgid "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 "Tagging preset sources"
+#~ msgstr "Källor för snabbval för taggning"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importera TCX-fil..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importera TCX-fil som GPS-spår"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "Skickar data"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Inte implementerat ännu."
+
 #~ msgid "Email"
 #~ msgstr "Email"
@@ -22640,4 +22827,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Jämka konflikter"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
 
 #~ msgid "{0} object has conflicts:"
@@ -22678,4 +22868,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Jämka {0} konflikter i {1} objekt"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Klicka på Uppdatera för att uppdatera listan"
+
+#~ msgid "Revert"
+#~ msgstr "Återgå"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Återställ alla de nu valda objekten till den version som valts i "
+#~ "historiklistan."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22854,4 +23060,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Välj åtminstone en nod, sträcka eller relation. Endast objekt som redan "
+#~ "skickats in har en historik."
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -22884,2 +23097,47 @@
 #~ msgid "Start routing"
 #~ msgstr "Påbörja ruttberäkning"
+
+#~ msgid "Undeleting Way..."
+#~ msgstr "Ångrar radering av väg..."
+
+#~ msgid "Checking whether node {0} is gone ..."
+#~ msgstr "Kontrollerar huruvida nod {0} är borta..."
+
+#~ msgid "Undeleting relation..."
+#~ msgstr "Återskapar relation..."
+
+#~ msgid "Checking whether primitive {0} is gone ..."
+#~ msgstr "Kontrollerar huruvida primitiv {0} är borta..."
+
+#~ msgid "Keep mine"
+#~ msgstr "Behåll mina"
+
+#~ msgid "Delete mine"
+#~ msgstr "Radera mina"
+
+#~ msgid ""
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
+#~ msgstr ""
+#~ "<html>OSM primitiv id <strong>{0}</strong> har raderats på servern<br>av "
+#~ "en annan kartograf.<br><br>Klicka <strong>{1}</strong> för att behålla "
+#~ "ditt primitiv och ignorera det raderade tillståndet.<br>Ditt primitiv "
+#~ "kommer att tilldelas ett nytt id.<br>Klicka <strong>{2}</strong> för att "
+#~ "acceptera det nya tillståndet på servern och radera ditt primitiv."
+#~ "<br>Klicka <strong>{3}</strong> för att avbryta.<br>"
+
+#~ msgid ""
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
+#~ msgstr ""
+#~ "<html>Det finns <strong>{0}</strong> primitiv<br>markerade för "
+#~ "individuell uppdatering. Vänligen reducera<br>urvalet till max {1} "
+#~ "primitiv.</html>"
+
+#~ msgid "Selection too big"
+#~ msgstr "Markering för stor"
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 16400)
+++ applications/editors/josm/i18n/po/tr.po	(revision 16407)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-19 21:56+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-06-27 15:51+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Türkçe\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:19+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -27,6 +27,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -34,30 +34,31 @@
 msgstr "Yardım"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Saklanılmayan Çalışmalar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Bazı çalışmalar saklanılmadı. Değişikliklerden vazgeç ve Devam Et?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -70,12 +71,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -89,7 +90,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -100,32 +101,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "İptal"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Yanlış linkler atlanıldı: URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Yanlış dosyalr atlanıldı URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "BİLİNMEYEN"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "Hakkında"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "Hakkında penceresini göster."
@@ -133,10 +134,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -144,25 +145,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "Versiyon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "En son değişiklik {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "Hata raporları"
@@ -172,5 +174,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -178,27 +180,27 @@
 msgstr "Bilgi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "Okubeni"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "Revizyon"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "Katkılar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "JOSM Hakkında..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "Dosya bulunamadı."
@@ -212,12 +214,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Lütfen basitleştime için en az bir yol seçiniz."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "Uyarı"
@@ -272,5 +273,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "Enlem"
@@ -279,5 +280,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "Boylam"
@@ -285,5 +286,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "Daire içindeki kavşakları hizala"
@@ -296,5 +297,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -382,7 +383,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "İlişkilerde Karışıklık"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -391,37 +391,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "bilgi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "tabaka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "Çelişki"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0} a Yaklaş"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Görünümü {0} a yaklaştır."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -431,9 +431,9 @@
 msgstr "Görüntü: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "Yaklaşılacak bir şey yok."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "Yaklaşılacak çelişki yok"
@@ -525,37 +525,41 @@
 msgstr "Lütfen kopyalama için seçim yapınız"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "Daire Oluştur"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "Seçili üç noktadan daire oluştur."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "Lütfen üç nokta veya üç nokta içeren bir yol seçiniz."
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "Noktalar daire içinde değiller."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "Lütfen üç nokta veya üç nokta içeren bir yol seçiniz."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "Sil"
@@ -605,5 +609,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -712,11 +716,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -727,5 +732,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Hata"
@@ -735,30 +740,30 @@
 msgstr "Ön tanımlı lisans seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM Online Yardım Dosyası"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Tarayıcıda Açınız"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "Düzenle"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -766,19 +771,19 @@
 msgstr "Yenile"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Yardım dosyalaları sadece online oalrak düzenlebilir"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Sayfanın yüklenmesinde hata {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -793,18 +798,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "OSM yolları ve kavşakları için geçmiş bilgisini göster."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "Elemanın Geçmişi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "OSM yolları ve kavşakları için geçmiş bilgisini göster."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -863,5 +865,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr ""
@@ -900,10 +902,10 @@
 msgstr "sağ"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Taşı {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -911,5 +913,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "Objeleri dünya dışına taşıyamazsın."
@@ -1104,5 +1106,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1112,26 +1114,25 @@
 "bildiriniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 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:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "Boş döküman"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "Çelişkiler"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1139,36 +1140,36 @@
 msgstr "Çözülmemiş çelişkiler var. Çelişkiler kaydedilmeyecektir! Devam?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "OSM dosyası olarak sakla"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "GPX olarak sakla"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "Yedek dosyası oluşturulamadı."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "Bilinmeyen dosya uzantısı."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "Kaydetme sırasında bir hata oluştu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "Yedek dosyası içeri alınırken hata oluştu."
@@ -1219,6 +1220,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr ""
@@ -1282,11 +1284,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"Rol tabanlı ilişki bütün yeni yollara kopyalandı.\n"
-"Gerek duyulursa kontrol edilmeli"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1465,68 +1464,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "OSM ye yükle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "Bütün değişiklikleri OSM server'ına yükle."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "Eklenilecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "Düzenlenecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "Silinecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "Değişiklikleri yükle?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Çözülmemiş çelişkiler var. İlk olarak çözümleyiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "Yüklenilecek değişiklik yok."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1540,17 +1539,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1561,10 +1560,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1574,9 +1573,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1586,18 +1585,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1702,24 +1701,15 @@
 msgstr "Ham GPS verisi"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "Bilgi İndiriliyor"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "İçeri bilgi alınamadı."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap verisi"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "Bilgi Tabakası"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1761,5 +1751,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1862,5 +1852,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 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."
@@ -1872,5 +1862,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız."
@@ -1888,7 +1878,7 @@
 "senkronize etmek için."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1896,9 +1886,9 @@
 msgstr "Seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "Objeyi seç,taşı ve dönder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1907,5 +1897,28 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "Sola Git"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "Sola Git"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "Geri AL(undo)"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1914,5 +1927,5 @@
 "yapıştır."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1929,5 +1942,5 @@
 msgstr "Zoom ve Harita Taşı"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2190,35 +2203,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "Ekle"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "Değiştir"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "Sil {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "{0} Objeyi Değiştir"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Kaldır \"{0}\" için {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Ayarla {0}={1} için {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2227,19 +2232,26 @@
 msgstr[0] "obje"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Kaldır \"{0}\" için {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Ayarla {0}={1} için {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2247,25 +2259,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "Sil {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "Sil {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "İlişkilerde Karışıklık"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2276,11 +2288,11 @@
 "İlişkiden sil?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2291,10 +2303,10 @@
 "İlişkiden Sil?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "Yol segmentini ayrıştır"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2305,20 +2317,20 @@
 "objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Taşı"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2343,43 +2355,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, 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:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "Seçimden çıkartınız"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "İlişkiÜyesinikaldır"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "Dönder"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "Sil {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "Sıra"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2477,25 +2495,51 @@
 msgstr "Tercihler serverdan alınamadı."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+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:31
+#: ../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:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "G"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "K"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "B"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "D"
@@ -2506,5 +2550,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2529,5 +2573,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2622,17 +2666,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2640,16 +2680,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2661,127 +2690,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "Alan stili yol kapalı değil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipoligon yolu ''{0}'' kapalı değil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "''{0}'' üyesini ilişkiden sil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Yol ''{0}'' iki noktadan az içeriyor."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgid "No \"from\" way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
-msgid "No \"from\" way found."
+msgid "No \"to\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "No \"via\" node or way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
+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
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 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
+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
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Kullanışlı rol yok ''{0}''  ''{1}'' yolu için."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Yol-Değil ''{0}'' multipolygon içinde."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipoligon için dış yol yok ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "iç yol ''{0}'' dışarıda."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "İç yol stili ''{0}'' multipolygon ."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Dış yol stili ''{0}'' bulunamadı."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "etiketsiz"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "metin"
@@ -2789,5 +2818,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2815,6 +2844,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "arkaplan"
@@ -2824,24 +2853,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"Projeksiyon \"{0}\" şu alanlar için tasarlandı\n"
-"enlem  46.1° ve 57° arası.\n"
-"Lütfen farklı bier projeksiyonu seçiniz\n"
-"eğer Fransız WMS kullanmıyorsanız.\n"
-"Bu mesajdan sonra herhangi bir şey yükleme."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2852,30 +2866,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambert Zone (Fransa)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-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 ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "Taşı {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2887,14 +2895,14 @@
 msgstr "Yer imleçleri yazılamadı."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "Günün Mesajı mevcut değil"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -3088,5 +3096,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3148,5 +3155,5 @@
 msgstr "Dışarı Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "ölçek"
@@ -3180,8 +3187,13 @@
 msgstr "(obje yok)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "tabaka listede yok."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3189,9 +3201,9 @@
 msgstr "OSM serverına bağlanılıyor..."
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "Ayrıştırma esnasında hata"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "Dosya bulunamadı"
@@ -3251,4 +3263,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3258,4 +3271,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3263,5 +3278,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Üyeler"
@@ -3457,7 +3473,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3537,4 +3553,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3542,4 +3561,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3549,4 +3569,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3575,7 +3596,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "Bağlantı hatası."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3663,7 +3683,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "Lütfen bu yer için bir isim giriniz."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3705,7 +3724,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "Tarih Yok"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3737,7 +3755,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "Seçimden çıkartınız"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3748,9 +3765,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "Rol"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3768,4 +3787,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3789,8 +3810,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3801,7 +3822,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3857,5 +3879,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "Komut Yığını"
@@ -3866,6 +3888,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3876,5 +3898,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3883,10 +3905,27 @@
 msgstr "Anahtar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "Komut Yığını: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "Çelişki"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "Çelişkileri Birleştir."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Çözümle"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "Seçili nesneler için birleştime penceresi aç."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3895,26 +3934,4 @@
 msgstr "Haritada seçili elemanları listedede seç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "Çözümle"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Seçili nesneler için birleştime penceresi aç."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "Çelişki"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "Çelişkileri Birleştir."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "Çeşişkiler: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -3950,43 +3967,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "Tazelemek için Yenile düğmesine basınız"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "Geçmiş"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "Seçili nesnelerin geçmişini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "Obje"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "Tarih"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Reload all currently selected objects and refresh the list."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "Değiştir"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr "Seçili objelerin durumlarını geçmiş listesinde seçili olana çevir"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "Henuz Yapılmadı."
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4117,4 +4139,18 @@
 msgid "Add Properties"
 msgstr "Özellik Ekle"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "Ekle"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4225,14 +4261,14 @@
 msgstr "Seçim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "Panelin kilidini Kaldır"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "paneli büyütüp/küçültmek için tıklayınız"
@@ -4262,179 +4298,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "Meşgul Eden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "Etiket (Boş değerler etiketi siler)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "Seçili üyeyi yukarı taşı"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "Seçileni Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "Seçili bütün objeleri üye olarak ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "Spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "Seçili kaynağı listeden sil."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "Seçili üyeyi aşağı taşı"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "Üyeleri İndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "Evet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "hayır"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "Üyeler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "İçeri taşıma esnasında karşıklık oluştu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "Serverın cevabı tanımlanamdı."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "Server'a bağlantı kurulamadı."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4469,21 +4428,21 @@
 msgstr "İlk olarak sık kullanılanlardan bir yer seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4491,5 +4450,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "Sınır Çerçevesi"
@@ -4638,654 +4597,41 @@
 msgstr "Pafta Numarası"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "{0} için görüntüler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "GPX Oku..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Noktalrı için {0} x {1} zaman yok"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Zaman şu noktalar  \"{0}\" {1} x {2} için okunamadı"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "Zaman damgası okunabilen bir görüntü bulunamadı."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "{0} Okunuyor..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "Geotagged Görüntüler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS başlangıç: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS bitiş: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "şu anki delta: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "zaman dilimi farkı: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "görüntü"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} izde var."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "Saati eşle"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG görüntüsü (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "EXIF zamanı \"{0}\" dosyasında yok."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "Görüntü"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS ünitesi zamandilimi (resim farkı)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "Girilen zaman ayrıştırılamadı."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps noktası"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "Çizimi özelleştir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "Genel ayarları kullan."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-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:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-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:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "Çizim seçeneklerini seçiniz"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "Renkleri Ayarla"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Varsayılan"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Renk seç"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "işaretli noktalardan imleçler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} isim verilen izler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "Sesi içeri al"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} daki ses imleçleri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "Görüntüleri içeri al"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} iz, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rut, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} yol noktaları"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "İsim: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "Tanım: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Zaman_aralığı: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "Uzunluk: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "Bilgi tabakasına çevir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>İşlenilmemiş GPS bilgisis yüklemek zararlı olabilir.<br>Eğer izleri "
-"yüklemek isterseniz buraya bakınız:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Çevrildiği yer: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "OSM den bu izi indir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "Bunun içindeki herşeyi indir:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metre"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "Her istek için max. alan:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km2"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Bu hareket {0} ayrı indirme<br> isteği gerektirir. <br>Devam etmek "
-"istiyor musunuz?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-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:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "indirilen alanın dışında"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} şunları içerir:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} silindi.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "GPX tabakasına çevir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "iz"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "nokta"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "{0} noktalı iz"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} {1} izden oluşur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} nokta"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "gps imleçi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "imleç"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} {1} imleçten oluşur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "Sesi Eşle"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "Ses {0} noktasında eşlendi."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-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:233
-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:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "Sesi işaretlemek istediğinizde çalan kaydı durdurmanız gerekir."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Sesi işaretleyecek herhangi bir nesne yok."
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"Ses imlecinin üzerine SHIFT-ile sürükleyiniz veya eşleyeceğiniz noktaya "
-"sürükleyiniz."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "Yeni ses imleci oluşturulamadı."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "Bu imleç için tanımlanan link gösterilemedi."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "Linkin gösterilmesinde hata"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "İleri Tercihler"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Tercihleri doğrudan ayarla. Dikkatli kullanılmalı!"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "Seçim varsayılan değer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "Varsayılan değer ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Varsayılan değer bilinmiyor (ayar henuz kullanılmadı)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "Editlemek için bir satır seçiniz."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "{0} için yeni değer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "Silmek için bir satır seçiniz."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "Yeni bir anahtar/değer çifti gir"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "Ses menüsünü göster."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "Ses, görüntü ve web imleçlerini işaretle."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "Aktif ses izini göster."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "GPX dosyası okunurken sessiz imleç oluştur."
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "Kesin ve geçerli zaman damgalı yol noktaları."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Zamanı tahmin edilen kesin yol noktaları, izlerden."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "İsimlendirilmiş izler."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "İzin başlangıcı (başka imleç yoksa hep bu kullanılır)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Asıl araç çubuğundan ses menusunu gizle/göster."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr "Sesin kayıt edildiği yerde hareketli bir ikonu iz boyunca göster."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr "Bütünses,görüntü ve web imleçleri metin etiketi yerleştir."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"GPX dosyası açılınca otomatik olarak yol noktalarından imleç tabakası oluştur"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "Sesi içeri alırken, imleçler oluştur"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Sesi içeri alırken, herhangi bir yol noktasına GPX tabakasında ekle"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"İsmi veya tanımlaması olan izlerden otomatik olarak ses imleçleri oluştur,"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"İlgili düğmeye basıldıktan sonra ilieri veya geri atlama zamanı, sn olarak"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "İleri/Geri (saniye)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Hız ilerleme durumu"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "Hızlı ilerleme çarpanı"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"Sein çalınması bu saniyede başlar (öncesinde veya sonrasında), ses izi "
-"gereklidir"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Lead-in zamanı (saniye)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr "Asıl kayıt zamanı ile kayıt cihazının kaydettiği zaman arası oran"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "Ses kayıt cihazı kalibrasyonu"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "Renk"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -5995,5 +5341,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6144,40 +5491,715 @@
 msgstr "İsim"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "{0} için görüntüler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "GPX Oku..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Noktalrı için {0} x {1} zaman yok"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Zaman şu noktalar  \"{0}\" {1} x {2} için okunamadı"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "Zaman damgası okunabilen bir görüntü bulunamadı."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "{0} Okunuyor..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "Geotagged Görüntüler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS başlangıç: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS bitiş: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "şu anki delta: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "zaman dilimi farkı: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "görüntü"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} izde var."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "Saati eşle"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG görüntüsü (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "EXIF zamanı \"{0}\" dosyasında yok."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "Görüntü"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS ünitesi zamandilimi (resim farkı)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "Girilen zaman ayrıştırılamadı."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps noktası"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "Çizimi özelleştir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "Genel ayarları kullan."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+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:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+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:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "Çizim seçeneklerini seçiniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "Renkleri Ayarla"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Varsayılan"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Renk seç"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "işaretli noktalardan imleçler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} isim verilen izler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "Sesi içeri al"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} daki ses imleçleri"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "Görüntüleri içeri al"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} iz, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rut, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} yol noktaları"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "İsim: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "Tanım: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Zaman_aralığı: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "Uzunluk: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "Bilgi tabakasına çevir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>İşlenilmemiş GPS bilgisis yüklemek zararlı olabilir.<br>Eğer izleri "
+"yüklemek isterseniz buraya bakınız:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Çevrildiği yer: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "OSM den bu izi indir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "Bunun içindeki herşeyi indir:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metre"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "Her istek için max. alan:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km2"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Bu hareket {0} ayrı indirme<br> isteği gerektirir. <br>Devam etmek "
+"istiyor musunuz?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+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:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "indirilen alanın dışında"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} şunları içerir:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} silindi.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "GPX tabakasına çevir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "iz"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "nokta"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "{0} noktalı iz"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} {1} izden oluşur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} nokta"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "gps imleçi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "imleç"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} {1} imleçten oluşur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "Sesi Eşle"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Ses {0} noktasında eşlendi."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+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:233
+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:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "Sesi işaretlemek istediğinizde çalan kaydı durdurmanız gerekir."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Sesi işaretleyecek herhangi bir nesne yok."
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Ses imlecinin üzerine SHIFT-ile sürükleyiniz veya eşleyeceğiniz noktaya "
+"sürükleyiniz."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "Yeni ses imleci oluşturulamadı."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Bu imleç için tanımlanan link gösterilemedi."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Linkin gösterilmesinde hata"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "İleri Tercihler"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Tercihleri doğrudan ayarla. Dikkatli kullanılmalı!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "Seçim varsayılan değer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Varsayılan değer ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Varsayılan değer bilinmiyor (ayar henuz kullanılmadı)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "Editlemek için bir satır seçiniz."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "{0} için yeni değer"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "Silmek için bir satır seçiniz."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "Yeni bir anahtar/değer çifti gir"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Ses menüsünü göster."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Ses, görüntü ve web imleçlerini işaretle."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Aktif ses izini göster."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "GPX dosyası okunurken sessiz imleç oluştur."
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Kesin ve geçerli zaman damgalı yol noktaları."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Zamanı tahmin edilen kesin yol noktaları, izlerden."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "İsimlendirilmiş izler."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "İzin başlangıcı (başka imleç yoksa hep bu kullanılır)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Asıl araç çubuğundan ses menusunu gizle/göster."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr "Sesin kayıt edildiği yerde hareketli bir ikonu iz boyunca göster."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr "Bütünses,görüntü ve web imleçleri metin etiketi yerleştir."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"GPX dosyası açılınca otomatik olarak yol noktalarından imleç tabakası oluştur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "Sesi içeri alırken, imleçler oluştur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "Sesi içeri alırken, herhangi bir yol noktasına GPX tabakasında ekle"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"İsmi veya tanımlaması olan izlerden otomatik olarak ses imleçleri oluştur,"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"İlgili düğmeye basıldıktan sonra ilieri veya geri atlama zamanı, sn olarak"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "İleri/Geri (saniye)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "Hız ilerleme durumu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Hızlı ilerleme çarpanı"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Sein çalınması bu saniyede başlar (öncesinde veya sonrasında), ses izi "
+"gereklidir"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Lead-in zamanı (saniye)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr "Asıl kayıt zamanı ile kayıt cihazının kaydettiği zaman arası oran"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Ses kayıt cihazı kalibrasyonu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "Renk"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Boya Stili {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "Seç"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "{0} için bir renk seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "JOSM da farklı objlerin kullandığı renkler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "Renkler"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6186,29 +6208,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Herhangi bir segment içeri alınmadıysa çizgileri zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Geniş gps noktaları çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -6216,5 +6238,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6235,5 +6257,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6271,5 +6293,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6282,50 +6304,50 @@
 msgstr "Ayak"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "Yön oklarını çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Hızlı Çizim (kötü görünür)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Sadece ilginiç yön ipuçlar (ör:tek yön)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "Sadece yolun başında"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Segment sıra numaralarını çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "İndirilen alan için sınırları çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Seçim modunda sanal kavşakları çiziniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Pasif tabakaları başka renkte çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Düzgün harita grafikleri (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6333,9 +6355,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
@@ -6344,25 +6366,25 @@
 "'-1' yap."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "Maximum uzunluk (metre)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Gelen çizimde herhangi bilgi olmasa bile çizime zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPS noktalarını bağlayan yönler için okları çiz."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Yön çizgi okları için tablo değerlerini kullan hesap yapma."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6370,13 +6392,13 @@
 msgstr "Son çizilen çizgiden sonra bu kadar boşluk varsa okları çizme"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "Minimum uzaklık (pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "GPS noktaları için geniş nokta çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6384,9 +6406,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6394,136 +6416,156 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Farklı ortalama hızar için farklı renklerin kullanılmasına izin ver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS Noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "Yol segmentleri için yön ipuçları çiz."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Her segment için kendi yolu buyunca sıra numarası çiz."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Daha düzgün harita grafikleri için 'antialiasing' uygula  ."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Server'dan gelen bilginin sınırlarını çiz ."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "Pasif tabakaları farklı renklerde çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM Data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "Backup dosyalarını sakla"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Saklama sırasında backup dosyalarının sonuna ~ ekle"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "Show splash screen at startup"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "Seçim listesindeki objenin ID sini göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "Görünüm"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "Varsayılan (Otomatik Seçilir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "Dil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "Önceden tanımlanmış ayarları etkinleştir"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "Önceden tanımlanmış ayarları etkinleştir"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "Yüklü eklentileri ayarla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "İndirme listesi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "Güncelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "Siteleri Ayarla..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "Lütfen bir seçim yapınız."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "Eklenti sitelerini ayarla"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "Ayarları Göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6531,98 +6573,98 @@
 msgstr "Programın görünüşünü değiştirmeye yarayan bir çok ayar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "Bağlantı Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "OSM server bağlantı ayarları."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "Harita Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "Harita Projeksiyonu ve İnterpolasyon Ayarları."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "Ses Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "Ses çalıcısı ve ses imleç ayarları."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Ayarların aktif olamsı için programı açıp/kapatmalısınız."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "koordinatları şu şekilde göster"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "Projeksiyon türü"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "Harita Projeksiyonu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "Projeksiyon türü"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "koordinatları şu şekilde göster"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "Proxy kullan"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "Proxy Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "Proxy server host"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "Proxy server port"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "Proxy server kullanıcı_adı"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "Proxy server şifresi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSM için asıl link"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "Asıl Link"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM şifresi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6637,77 +6679,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "Kısayol Tercihleri"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "Klavye kısayollarını elle değiştir."
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "Aksiyon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "Kısayol"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
-msgid "Sort presets menu"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "Önceden tanımlanmış ayarları etkinleştir"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "İlk ayarların kaynağı gösteriliyor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"Etiketleme ayarları kaynakları dosyası, yardım için:http://josm."
-"openstreetmap.de/wiki/TaggingPresets."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "Yeni bir etiketleme ayar dosyası ekle."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "Tanım: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "Tabakalar: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "Yazarlar: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "Uyarı: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "Versiyon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "Varsayılanı kopyala"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "Kopyalamak için bir satır seçiniz."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "Listeye yeni bir kaynak ekle."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
 msgid "Delete the selected source from the list."
 msgstr "Seçili kaynağı listeden sil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+msgid "Sort presets menu"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "Etiketleme Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "Etiketleme ayar kaynakaları"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "Ayıraç"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "Araç Çubuğu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Mevcut"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "Araç Çubuğu Özelleştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "Araç çubuğundaki elemanlar özelleştir."
@@ -6971,6 +7044,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7295,5 +7368,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7303,15 +7376,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "Eklentileri Güncelle"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7324,5 +7397,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7331,23 +7404,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7395,6 +7468,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "Eklentiyi Pasif Yap"
@@ -7409,5 +7482,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7417,5 +7490,5 @@
 "üzerine yazma yetkisi varmıdır kontrol ediniz."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7423,10 +7496,10 @@
 msgstr "''{0}'' Eklentisinden beklenmeyen bir durum oluştu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Eklenti Yazarın {0} Olduğunu Belirtiyor."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7434,9 +7507,9 @@
 "Hata bildirmeden önce eklentinin yeni versiyonu ile güncellemeyi deneyin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "Eklentiyi Pasif Hale Getireyim mi?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7446,5 +7519,5 @@
 "çalıştırın."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7452,19 +7525,19 @@
 msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "Bilgi"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "Açıklama mevcut değil"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7472,13 +7545,13 @@
 msgstr[0] "{0} sitesinden indirilen eklenti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "Eklenti bilgisi bulunamadı."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "Bütün eklentiler güncel."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7491,9 +7564,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "Eksik eklentileri yükle"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7506,6 +7579,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7528,14 +7601,14 @@
 msgstr "bilinmeyen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versiyon {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "Eklenti JOSM ile beraber geliyor."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7792,45 +7865,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIF den GPS verisi çıkartılıyor"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "klasör arama başladı"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "Seçilen yollardan birisi null !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "Fotoğraflar okunuyor..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kananoik yol klasör için bulunamadı {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Klasör aranıyor {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Klasörde null dosya bulundu {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, 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:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "GPX e göre ilişkilendir"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8038,20 +8111,20 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8059,13 +8132,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr ""
@@ -8087,5 +8160,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Dosya Yüklemede Sorun"
@@ -8418,5 +8491,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "Boş Tabaka"
@@ -8519,17 +8592,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Dosya Format Hatası"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA içeri alınması başarılı"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "NMEA içeri alınmasında hata!"
+msgid "TCX Files (*.tcx)"
+msgstr "GPX Dosyaları (*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8554,5 +8629,5 @@
 msgstr "Çiftli yol oluştur"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
@@ -8573,11 +8648,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "Yolu GPX tabakasından içeri al"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "Var olan yolu iptal et"
@@ -8586,6 +8661,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "GPX veri tabaksı bulunamadı."
@@ -8648,6 +8723,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "Yenile"
@@ -8955,7 +9030,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "su"
@@ -9295,14 +9370,14 @@
 msgstr "Başlık çeşitli değerler taşır ve bir metine atanamaz."
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreet Hatalarını Aç"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9432,19 +9507,19 @@
 msgstr "Onaylanan Hareket"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 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:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "İstek Detayı: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "Buna izin veriyormusunuz?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9568,7 +9643,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "Yükleniyor..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9757,13 +9831,4 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "İlk olaraklar tercihlerden etiket kaynağını seçmelisiniz."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "TCX Dosyası içeri al..."
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "TCX Dosyasını GPS izi olarak içeri al"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -9975,33 +10040,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr ""
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr ""
@@ -10312,24 +10377,24 @@
 msgstr "Bu test yazım hatalarına karşı test yapar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "Özellik kontol edici :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 "Bu test özellik anahtarlarını ve değerlerindeki yanlışları kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Geçersiz etkiket kontrol satırı - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Geçersiz imla yanlışı satırı: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10340,5 +10405,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "Geçersiz etiket/anahtar kombinasyonu"
@@ -10346,60 +10411,60 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "Renklendirme problemi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Anhatar ''{0}'' geçersiz ."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "Boş değerli etiketler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "Geçersiz özellik anahtar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "Özellik anahtarında geçersiz -boşluk- karakteri"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "Özellik anahtarı -boşluk- karakteri ile başlıyor veya bitiyor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "Özellik anahtarı HTML bilgisi içeriyor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "Beni Düzelt!"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "Özellik anahtarını kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -10407,20 +10472,20 @@
 "kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "Karışık özellik kontrolu kullan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Özellik anahtar ve etiketlerini karmaşık kuralları kullnarak kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "Etiket kontrolcusu kaynağı"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10429,74 +10494,84 @@
 "İmla kontrolu için kaynak dosya veya link veya etiket kontolcusu veri dosyası"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "Listeye yeni bir kaynak ekle."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "Seçili kaynağı kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "Veri kaynakları"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "Özellik değerlerini kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr "Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "Beni Düzelt! leri kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Beni Düzelt! değeri içeren yol veya noktalara bak."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Renklendirme notlarını kontro let."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr "Harita renklendirme hata durumunu kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "Varsayılan veri dosyasını kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "Varsayılan veri dosyasını kontrol et (önerilen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "Varsayılan veri dosyasını kontrol et."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "Varsayılan veri dosyasını kontrol et (önerilen)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "Varsayılan imla dosyasını kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Varsayılan imla dosyasını kontrol et (önerilen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "Özellikler Düzelt"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "Eleman tipi bulunamadı"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "Uyarı seviyesi bulunamadı"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Hatalı söylem ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10641,7 +10716,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "yapılar"
@@ -10655,5 +10730,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "alan"
@@ -10663,26 +10738,26 @@
 msgstr "Kapanmamış yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "Bağlantısız yollar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Bu test bir yolun son noktasının yakınında başka yol varmı kontrolunu yapar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "Yolun sonunda başka karayolu var"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "Yolun sonunda başka yol var"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "Yolun sonunda başka yol var"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr "Bağlı yolun sonuda başka yol var"
@@ -10706,17 +10781,22 @@
 msgstr "Bu test etiketsiz, boş ve tek noktalı yolları kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "İsimsiz yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "Kavşak Düzenle"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "Etiketsiz yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "Boş yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "Tek noktalı yollar"
@@ -10754,14 +10834,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "İstisna oluştu"
@@ -10859,5 +10939,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10870,15 +10950,15 @@
 msgstr "Otomatik indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, 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:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, 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:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -10887,102 +10967,91 @@
 "değiştirin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "Görünen mozaikleri indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "Çözünürlüğü değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../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:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../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:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../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:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Dosya Format Hatası"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Veri yüklemek için boş bir WMS tabakası aç"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "WMS Eklenti Tercihleri"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "WMS eklenti menusundeki, WMS server listesini değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "Menu İsmi"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS linki"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "Menu ismi (Varsayılan)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS linki (Varsayılan)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Menu ismi ve WMS linki kullanınız"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "Varsayılanı kopyala"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "Kopyalamak için bir satır seçiniz."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "İndir"
 
 #. *
@@ -11198,16 +11267,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11216,5 +11280,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11223,5 +11287,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11230,10 +11294,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12030,4 +12094,64 @@
 msgstr "Erişim"
 
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "Evet"
+
 #. color permissive
 #. <icon annotate="true" src="misc/no_icon.png"/>
@@ -12051,5 +12175,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "özel"
@@ -12097,5 +12221,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "varış"
@@ -12132,5 +12256,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr "ihtiyari"
@@ -12149,4 +12273,28 @@
 msgid "agricultural"
 msgstr "tarımsal"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "hayır"
 
 #: build/trans_presets.java:315
@@ -12362,6 +12510,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "araçyolu"
@@ -12387,6 +12535,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "ana_hat"
@@ -12412,6 +12560,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "birincil"
@@ -12437,6 +12585,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "ikincil"
@@ -12450,5 +12598,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "üçüncül"
@@ -12466,5 +12614,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "yerleşim_alanı"
@@ -12482,5 +12630,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "servis"
@@ -12507,6 +12672,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "inşaat"
@@ -12556,5 +12721,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "roundabout-döner kavşak"
@@ -13533,5 +13698,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "batak"
@@ -15262,27 +15427,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "spor"
@@ -18120,8 +18285,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "bisiklet"
@@ -18190,8 +18355,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "ayak"
@@ -18217,5 +18382,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "metro"
@@ -18345,4 +18510,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18351,4 +18517,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18357,4 +18524,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18363,4 +18531,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18424,7 +18593,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "köprü"
@@ -18482,4 +18651,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18605,7 +18775,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18688,15 +18858,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "kırılmış"
@@ -18738,5 +18908,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "at"
@@ -18946,11 +19116,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -18988,6 +19158,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "sokak"
@@ -19043,7 +19213,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "araçyolu_hattı"
@@ -19099,8 +19269,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "demiryolu"
@@ -19121,5 +19291,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19133,5 +19303,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19152,5 +19322,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "turningcircle-döner kavşak"
@@ -19165,5 +19335,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19178,5 +19348,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "riverbank"
@@ -19190,5 +19360,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "akış"
@@ -19202,5 +19372,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "iskele"
@@ -19228,5 +19398,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "su_kemeri"
@@ -19394,13 +19564,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "insan yapımı"
@@ -19462,7 +19632,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr "demiryolu_noktası"
@@ -19485,10 +19655,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "başka_demiryolu"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr "demiryolu_üzeri"
@@ -19508,7 +19678,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19516,8 +19689,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "eski_demiryolu"
@@ -19562,6 +19739,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "havayolu"
@@ -19575,5 +19752,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "terminal"
@@ -19595,5 +19772,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "havayolu_ağır"
@@ -19607,5 +19784,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "hafif_hafif"
@@ -19653,7 +19830,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "havayolu"
@@ -19670,5 +19847,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "basit_meydan"
@@ -19683,5 +19860,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "orta_meydan"
@@ -19696,5 +19873,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "büyük_meydan"
@@ -19709,5 +19886,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19722,5 +19899,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "acemiKullanıcı_meydanı"
@@ -19735,5 +19912,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "acemiKullanıcı_meydanı"
@@ -19838,10 +20015,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "güç"
@@ -19855,5 +20032,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "iskele"
@@ -19867,5 +20044,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "suhattı"
@@ -19993,12 +20170,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "dinlenme_yeri"
@@ -20012,5 +20189,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr ""
@@ -20082,8 +20259,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "dinlenme_yeri"
@@ -20185,10 +20362,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "tail_trafiği"
@@ -20574,22 +20751,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "eski_sokak_lambası"
@@ -20621,6 +20798,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "su_lambası"
@@ -20681,8 +20858,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "sağlık"
@@ -21035,26 +21212,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "alışveriş"
@@ -21126,8 +21303,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "hotel"
@@ -21277,9 +21454,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "turizm"
@@ -21351,8 +21528,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "tarihi"
@@ -21423,8 +21600,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "yeşil"
@@ -21438,5 +21615,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "taş_ocağı"
@@ -21450,5 +21627,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "toprak_doldurma"
@@ -21470,5 +21647,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "havza"
@@ -21482,5 +21659,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "orman"
@@ -21494,5 +21671,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "çiftlik"
@@ -21515,5 +21692,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "perakende"
@@ -21527,5 +21704,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "endüstri"
@@ -21539,5 +21716,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "ağaçsız_alan"
@@ -21551,5 +21728,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "yeşil_alan"
@@ -21563,5 +21740,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "demiryolu"
@@ -21618,7 +21795,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "askeri"
@@ -21632,5 +21809,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "mezarlık"
@@ -21643,5 +21820,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "zirve"
@@ -21656,5 +21833,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "buzul"
@@ -21668,5 +21845,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "volkanik"
@@ -21721,8 +21898,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "doğal"
@@ -21736,5 +21913,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "çalılık"
@@ -21748,5 +21925,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "çalılık"
@@ -21760,5 +21937,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "orman"
@@ -21772,5 +21949,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "çamur"
@@ -21784,5 +21961,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "sahil"
@@ -21860,8 +22037,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "rut"
@@ -21909,7 +22086,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "sınırlar"
@@ -22051,10 +22228,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr "yer"
@@ -22102,6 +22279,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "adres"
@@ -22332,10 +22509,10 @@
 msgstr "Landsat"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "Hava Haritası aç"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22343,5 +22520,5 @@
 msgstr "NPE Haritası"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22349,52 +22526,118 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap verisi"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Düzeltme)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "Bisiklet yolu"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK+)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Streets NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "Bilgi Tabakası"
+
+#~ msgid "Change"
+#~ msgstr "Değiştir"
+
+#~ msgid "Rotate"
+#~ msgstr "Dönder"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 46.1° and 57° only.\n"
+#~ "Use another projection system if you are not using\n"
+#~ "a French WMS server.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "Projeksiyon \"{0}\" şu alanlar için tasarlandı\n"
+#~ "enlem  46.1° ve 57° arası.\n"
+#~ "Lütfen farklı bier projeksiyonu seçiniz\n"
+#~ "eğer Fransız WMS kullanmıyorsanız.\n"
+#~ "Bu mesajdan sonra herhangi bir şey yükleme."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Çeşişkiler: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "İlk ayarların kaynağı gösteriliyor"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "Etiketleme ayarları kaynakları dosyası, yardım için:http://josm."
+#~ "openstreetmap.de/wiki/TaggingPresets."
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Yeni bir etiketleme ayar dosyası ekle."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Etiketleme ayar kaynakaları"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "TCX Dosyası içeri al..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "TCX Dosyasını GPS izi olarak içeri al"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Düzeltme)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK+)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
 #~ msgid "Uploading data"
 #~ msgstr "Bilgi yükleniyor"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "Henuz Yapılmadı."
+
 #~ msgid "Email"
 #~ msgstr "E-Mail"
@@ -22402,4 +22645,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Çelişkileri Çözümle"
+
+#~ msgid "Object"
+#~ msgstr "Obje"
 
 #~ msgid "{0} object has conflicts:"
@@ -22439,4 +22685,18 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Çözümle {0} karşıklıkları {1} objelerinde"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Tazelemek için Yenile düğmesine basınız"
+
+#~ msgid "Revert"
+#~ msgstr "Değiştir"
+
+#~ msgid "Date"
+#~ msgstr "Tarih"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr "Seçili objelerin durumlarını geçmiş listesinde seçili olana çevir"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 16400)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 16407)
@@ -3,21 +3,22 @@
 # This file is distributed under the same license as the josm package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-26 14:19+0000\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-07 10:33+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-"Language-Team: Traditional Chinese <zh_TW@li.org>\n"
+"Language-Team: Traditional Chinese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:17+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+"Language: zh_TW\n"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +26,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,30 +33,31 @@
 msgstr "說明"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "無法從偏好設定讀取投影資訊。使用麥卡托投影"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "提示：部分變更來自上傳到伺服器的新資料。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "未儲存的變更"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "還有尚未儲存的變更。是否要放棄變更後繼續？"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "存檔後離開"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "放棄修改且離開"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -68,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -87,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -98,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "取消"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "忽略不正確的 URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "忽略格式不良的檔案 URL： \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "不明"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "關於"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "顯示「關於」畫面。"
@@ -131,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -142,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "版本 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "上次改變於 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "上次修改 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "首頁"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "程式臭蟲回報"
@@ -170,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -176,27 +179,27 @@
 msgstr "資訊"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "讀我檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "重訂版本"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "貢獻者"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "外掛"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "關於 JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "找不到檔案"
@@ -210,12 +213,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "請選擇至少一個節點或路徑。"
+msgstr "請至少選擇一個已上傳的節點、路徑或關係。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "警告"
@@ -270,5 +272,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "緯度"
@@ -277,5 +279,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "經度"
@@ -283,5 +285,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "將節點排成圓"
@@ -294,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -359,9 +361,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
 msgid "Failed to initialize API. Please try again later."
-msgstr ""
+msgstr "初始化 API 失敗。請稍後再試一次。"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
 msgid "API initialization failed"
-msgstr ""
+msgstr "API 初始化失敗"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -380,46 +382,45 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "衝突的關係"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+msgstr "路徑 {1} 中的 {0} 個節點超過最大值。允許的節點數為 {2} 個"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "圖層"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "選取"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "下載"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "縮放至 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "將檢視縮放至 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -429,9 +430,9 @@
 msgstr "檢視：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "沒有選擇要縮放的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "沒有要縮放的衝突"
@@ -519,37 +520,41 @@
 msgstr "請選擇物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "建立圓形"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "從三個選取的節點建立圓形。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
-msgstr "請準確的選擇三個節點或是一個只有三個節點的路徑。"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
 msgid "Those nodes are not in a circle."
 msgstr "那些節點不在一個圓上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "請準確的選擇三個節點或是一個只有三個節點的路徑。"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "刪除"
@@ -599,5 +604,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -704,11 +709,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -719,5 +725,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "錯誤"
@@ -727,30 +733,30 @@
 msgstr "選擇預先定義的授權"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSM 線上說明"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "在瀏覽器中打開"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "編輯"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -758,19 +764,19 @@
 msgstr "重新載入"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "只能在 JOSM 線上求助中編輯求助頁面"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "載入頁面 {0} 時發生錯誤"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "求助頁面遺失。以 <A HREF=\"{0}\">english</A> 建立它。"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -787,18 +793,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "顯示 OSM 路徑或節點的歷史資訊。"
+msgstr "顯示 OSM 路徑、節點或關係的歷史紀錄資訊。"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "元件歷史"
+msgstr "元件的資訊"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "顯示 OSM 路徑或節點的歷史資訊。"
+msgstr "顯示 OSM 路徑、節點或關係的物件資訊。"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -857,5 +860,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "鏡射"
@@ -894,10 +897,10 @@
 msgstr "右"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "移動 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -905,5 +908,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "不能將物件移動到世界外頭"
@@ -1096,5 +1099,5 @@
 msgstr "檔案 {0} 已存在。是否覆蓋？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1102,26 +1105,25 @@
 msgstr "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "尚未開啟文件故沒有可儲存的項目。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "空的文件"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "文件沒有包含資料。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "強制儲存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1129,36 +1131,36 @@
 msgstr "尚有未解決的衝突。如果您全部拒絕就不會儲存衝突。是否繼續？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "拒絕衝突項目並儲存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "儲存 OSM 檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "儲存 GPX 檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "儲存圖層"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "無法備份檔案。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "不明的延伸檔名。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "存檔時發生錯誤"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "在還原備份檔案時發生錯誤。"
@@ -1207,6 +1209,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "關閉"
@@ -1266,9 +1269,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
-msgstr "以角色為基礎的關係成員已複製到所有新的路徑。"
+msgstr ""
+"關係成員已複製到所有的新路徑。\n"
+"您應該進行檢驗並在必要時修正它。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1444,68 +1448,68 @@
 msgstr "選擇區域是空的"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "上傳至 OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "將所有的變更上傳至 OSM 伺服器。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "要加入的物件："
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "要編輯的物件："
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "要刪除的物件："
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "提供關於您所上傳變更的簡短註解："
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "是否上傳這些變更？"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "上傳變更"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "沒有要上傳的項目。請先取得一些資料。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "尚有未解決的衝突。您必須先解決那些衝突。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "沒有要上傳的變更。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr "正在上傳"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "只同步 {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr "同步整個資料組"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1519,17 +1523,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr "偵測到衝突"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "未預期的回傳值。得到 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1543,10 +1547,10 @@
 "<strong>{1}</strong>則會放棄並繼續編輯。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "警告：錯誤的標頭「{0}」與預期的樣式「{1}」不符"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1556,9 +1560,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1568,18 +1572,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr "上傳至 OSM API 失敗"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1686,24 +1690,15 @@
 msgstr "原始 GPS 資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "正在下載資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "沒有匯入資料。"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "資料圖層 {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap 資料"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "資料圖層"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1745,5 +1740,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1845,5 +1840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放開滑鼠按鈕以選擇矩形內的物件。"
@@ -1854,5 +1849,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "放開滑鼠按鈕以停止旋轉。"
@@ -1869,7 +1864,7 @@
 "將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1877,9 +1872,9 @@
 msgstr "選擇"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "選擇、移動和旋轉物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1887,10 +1882,33 @@
 msgstr[0] "加入並移動虛擬新節點至{0}路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "左移"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "左移"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "復原"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 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:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1909,5 +1927,5 @@
 msgstr "縮紋並移動地圖"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2176,35 +2194,27 @@
 msgstr "與伺服器連線時發生錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "加入"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "改變"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "刪除 {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "改變 {0} 個物件"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "從 {1} 「{2}」移除「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "將 {2}「{3}」設定 {0}={1}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2213,19 +2223,26 @@
 msgstr[0] "物件"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "從 {1} {2} 移除「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "將 {2} {3} 設定 {0}={1}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
 msgstr "改變關係成員角色"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2233,25 +2250,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr "不能未決定的衝突"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "刪除 {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "刪除 {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "衝突的關係"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2262,11 +2279,11 @@
 "是否自關係中刪除？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "自關係中刪除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2277,10 +2294,10 @@
 "是否自關係中刪除？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "分割路徑區段"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2291,20 +2308,20 @@
 "看到的）可能會使用它們。<br>確定要刪除嗎？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "解決 {0} 刪除狀態的衝突"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "移動"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2329,9 +2346,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, fuzzy, java-format
+#, java-format
 msgid "removing reference from relation {0}"
-msgstr "從選擇區域移除"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
@@ -2339,34 +2356,41 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+#, fuzzy, java-format
+msgid "RemoveRelationMember {0} {1}"
 msgstr "移除關係成員"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "旋轉"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, 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:72
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../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:52
+#: ../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
+#, fuzzy
+msgid "Main.ds doesn't include node {0}"
+msgstr "我的資料組合並未包含設定鍵 {0} 的標籤"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2463,25 +2487,51 @@
 msgstr "無法從伺服器載入偏好設定。"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "參數「{0}」必須不為空值(null)"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "十進位經緯度"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgstr "度-分-秒格式"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "南"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "北"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "西"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "東"
@@ -2492,5 +2542,5 @@
 msgstr "參數 {0} 必須 > 0 。得到 {1}。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2515,5 +2565,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2608,17 +2658,13 @@
 msgstr "找不到最新的版本。歷史紀錄是空的。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2626,16 +2672,5 @@
 msgstr "參數「{0}」應為 > 0，得到「{1}」"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr "參數「{0}」必須不為空值(null)"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2647,127 +2682,127 @@
 msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "區域類型的路徑並未封閉。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "多邊形路徑「{0}」並未封閉。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../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:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "關係中已刪除的成員「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "路徑「{0}」少於兩個節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr "找到一個以上「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "找到一個以上「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "找到一個以上的「經過」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明的角色「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "「{0}」的不明成員類型。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "找不到「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "找不到「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "找到一個以上「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "「從」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "「到」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "「從」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "「到」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "找不到限制 {0} 的樣式"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "路徑「{1}」沒有有用的角色「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "多邊形中有非-路徑「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "多邊形「{0}」沒有外部路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "路徑「{0}」和「{1}」之間的十字路。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "內部路徑「{0}」在外。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "內部路徑「{0}」的樣式等同多邊形。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "外部路徑「{0}」的樣式不符。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "未上標籤的"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "文字"
@@ -2775,5 +2810,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2801,6 +2836,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "背景"
@@ -2810,24 +2845,9 @@
 msgstr "突顯"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"投影法「{0}」只設計用於\n"
-"緯度 46.1° 到 57° 之間。\n"
-"如果您不是使用法國 WMS 伺服器，\n"
-"請使用別種投影系統。\n"
-"看到此訊息後請勿上傳任何資料。"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2843,36 +2863,24 @@
 "並在新的區域開啟新的圖層。"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "Lambert Zone (法國)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (愛沙尼亞)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "麥卡托投影"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"投影法「{0}」只設計用於\n"
-"緯度 45.7° 到 47.9° 和\n"
-"經度 5.7° 到 10.6° 之間。\n"
-"如果您不是在製作瑞士或列支敦斯登的資料，\n"
-"請使用別種投影系統。\n"
-"看到此訊息後請勿上傳任何資料。"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "移動 {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2884,14 +2892,14 @@
 msgstr "無法寫入書籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "無法取得當天的訊息。"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- 執行的版本是 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "正在下載「當天的訊息」"
@@ -3082,5 +3090,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3142,5 +3149,5 @@
 msgstr "拉遠"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "縮放"
@@ -3174,18 +3181,23 @@
 msgstr "(沒有物件)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "圖層不在清單中。"
 
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
 msgid "Contacting the OSM server..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "分析時發生錯誤"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "找不到檔案"
@@ -3236,5 +3248,5 @@
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
-msgstr ""
+msgstr "角色 {0} 沒有參與比較配對 {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
@@ -3245,4 +3257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3252,4 +3265,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr "節點"
@@ -3257,5 +3272,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "成員"
@@ -3336,5 +3352,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
@@ -3451,7 +3467,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3528,4 +3544,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3533,11 +3552,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
 "adjustable {0} not registered yet. Can't set participation in synchronized "
 "adjustment"
-msgstr ""
+msgstr "可調整的 {0} 尚未註冊。不能設定在同步調整中的參與"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3559,14 +3580,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr "與伺服器連線時發生錯誤。"
+msgstr "<html>與伺服器溝通時發生錯誤<br>詳細資料：{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "與伺服器連線時發生錯誤。"
+msgstr "與伺服器溝通失敗"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3628,7 +3648,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
-#, fuzzy
 msgid "Visible State:"
-msgstr "刪除的狀態："
+msgstr "可視狀態："
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
@@ -3650,19 +3669,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
 msgid "visible (on the server)"
-msgstr ""
+msgstr "可視的（在伺服器上）"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
 msgid "not visible (on the server)"
-msgstr ""
+msgstr "不可視（在伺服器上）"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "請輸入此位置的名稱。"
+msgstr "保留本地端版本的複本"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
-#, fuzzy
 msgid "Physically delete from local dataset"
-msgstr "我的版本（本地端資料組合）"
+msgstr "實際從本地端資料組合中刪除"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
@@ -3691,18 +3708,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
-#, fuzzy
 msgid "Keep my visible state"
-msgstr "保留我的刪除狀態"
+msgstr "保留我的可見性狀態"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
-#, fuzzy
 msgid "Yes, reset the id"
-msgstr "是的，也取消它們的刪除"
+msgstr "是，重設 id"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "沒有日期"
+msgstr "否，中止"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3713,17 +3727,18 @@
 "agree?</html>"
 msgstr ""
+"<html>要保留您的本地端版本，JOSM<br>必須將 {0} {1} 的 id 重設為 0。<br>在下次"
+"上傳時伺服器會重新分配<br>新的 id 給它。<br>您是否同意？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
 msgid "Reset id to 0"
-msgstr ""
+msgstr "重設 id 為 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
-#, fuzzy
 msgid "Keep their visible state"
-msgstr "保留他們的刪除狀態"
+msgstr "保留他們的可見性"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
-msgstr ""
+msgstr "是，清除它"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
@@ -3735,21 +3750,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "從選擇區域移除"
+msgstr "從資料組合移除"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
-#, fuzzy
 msgid "Undecide conflict between visible state"
-msgstr "已刪除狀態之間未解決的衝突"
+msgstr ""
 
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "角色"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3767,4 +3782,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<未定義的>"
@@ -3788,8 +3805,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3800,7 +3817,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3856,5 +3874,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "指令堆疊"
@@ -3865,6 +3883,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../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:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3875,5 +3893,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3882,10 +3900,27 @@
 msgstr "切換：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "指令堆疊：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "衝突"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "正在合併衝突。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "解決"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "開啟上列清單所有選取的項目的合併對話盒。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3894,26 +3929,4 @@
 msgstr "在地圖上設定選取的元件為上列清單中選取的項目。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "解決"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "開啟上列清單所有選取的項目的合併對話盒。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "衝突"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "正在合併衝突。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "衝突： {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -3952,43 +3965,48 @@
 "決衝突。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "按下重新載入來重新整理清單"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "歷史紀錄"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "顯示所有選取的項目歷史紀錄。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "物件"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "日期"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr "歷史記錄項目"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr "載入歷史紀錄"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "重新載入所有目前的物件並重新整理清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "還原"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr "將所有目前選取物件的狀態還原至歷史紀錄中選取的版本。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "尚未實作。"
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr "顯示"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4119,4 +4137,18 @@
 msgid "Add Properties"
 msgstr "加入屬性"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "加入"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4227,14 +4259,14 @@
 msgstr "選擇區域：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "解鎖面板"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "點選以最小化/最大化面板內容"
@@ -4264,179 +4296,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "套用變更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "基本"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "被此佔據："
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "已連結"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "標籤 (數值留空會刪除該標籤)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "上移"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "將目前選取的成員上移"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "加入選取的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "將所有目前選取的物件加入為成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "移陳選取的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "將所有目前選取的物件從關係中移除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "運動"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "從清單刪除選取的來源。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "下移"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "將目前選取的成員下移"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "將目前表格列中的成員自這個關係中移除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "下載成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "下載關係中所有不完整的路徑和節點"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. item "Ways/Track" combo "Motorcycle"
-#. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
-#. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "是"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "否"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "成員：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "關係編輯器：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "匯入時有衝突項目。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "解析伺服器回應時發生錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "不能連線至伺服器。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr "與伺服器連線時發生錯誤。"
@@ -4471,21 +4426,21 @@
 msgstr "先選擇一個書籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "最小經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "最大經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4493,5 +4448,5 @@
 msgstr "www.openstreetmap.org 的 URL (您可以在這裡貼上 URL 下載該區域)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "綁定方塊"
@@ -4640,645 +4595,41 @@
 msgstr "拼貼數"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "{0} 的圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "讀取 GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "點 {0} x {1} 沒有時刻"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "不能讀取點 {1} x {2} 的時刻「{0}」"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "找不到具可讀時刻戳記的圖片。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "正在讀取 {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "有 Geotag 的圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS 開始：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS 結束：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "時區差異： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} 在此軌跡中。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "同步時鐘"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG 圖片 (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "檔案「{0}」的日期無法解析。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "在檔案「{0}」中沒有 EXIF 時刻。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS 單元時區 (不同於照片)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "與 GPS 單元同步時刻"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "輸入的時刻無法解析。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "gps 點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "自訂線條的繪製"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "使用全域設定值。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "在這個圖層的各點之間繪出線條。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr "在這個圖層的各點之間不要繪出線條。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "選擇線條繪製選項"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "自訂顏色"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "確定"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "預設值"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "選擇一種顏色"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "已命名點的標記"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} 的已命名軌跡點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "匯入音效"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave 音效檔案 (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} 的音效標記"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "匯入圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} 軌跡， "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} 路線， "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} 景點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "名稱：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "描述：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "長度： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "轉換為資料圖層"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>上傳未經處理的 GPS 資料做為地圖資料被認為是有壞處的。<br>如果您想要上傳"
-"軌跡，請看這裡："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "轉換自：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "從 OSM 沿這條軌跡下載"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "下載這裡面的每個物件："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} 公尺"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "每個要求最大區域："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} 平方公里"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr "部分景點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr "部分景點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "超出下載的區域"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "版本 {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "匯入時有 {0} 個衝突。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} 組成："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} 已刪除。)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "取消設定"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "API 版本： {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "轉換為 GPX 圖層"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "軌跡"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "有 {0} 個點的軌跡"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0} 由 {1} 軌跡組成"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} 點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "gps 標記"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "標記"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} 由 {1} 標記組成"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "同步音效"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-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:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "音效同步於點 {0}。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr "在播放時無法於圖層同步。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "您需要在軌跡上想標記的點暫停音效。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "這個圖層中沒有既存的音效標記可位移。"
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "無法建立新的音效標記。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "嘗試顯示這個標記的 URL 時發生錯誤"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URL 是： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "在顯示 URL 時發生錯誤"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "進階的偏好設定"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "直接設定偏好設定項目。請小心使用！"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "搜尋： "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "目前的數值是預設值。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "預設值是「{0}」。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "預設數值目前不明（設定值尚未使用）。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "請選擇要編輯的列。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "{0} 的新數值"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "請選擇要刪除的列。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "輸入新的設定鍵/數值配對"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "顯示音效選單。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "標籤音效（及圖片、網頁）標記。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "顯示即時音效追蹤。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "讀取 GPX 時建立非音效標記。"
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "具有效時間戳記的明確景點。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "以軌跡位置判斷明確景點的時刻"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "已命名的軌跡點。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "音效檔案的修改次數（時間戳記）。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "軌跡的開頭（如果沒有其他的標記可用就會這麼做）。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "顯示或隱藏主要選單列的音效選單項目。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr "顯示會移動的圖示來顯示出目前播放的音效所記錄同步於軌跡上的點。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr "在音效（和圖片、網頁）標記的按鈕圖示旁放上文字標籤。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr "開啟 GPX 圖層時自動從任何景點製作標記圖層。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "匯入音效時，由此製作標記..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "匯入音效時，將它套用到 GPX 圖層的任何景點中。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr "從軌跡點（非明確的景點）自動建立音效標記，並加上名稱或描述。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr "依據每個匯入的音效 WAV 檔案修改的時刻在軌跡上的位置建立音效標記。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "快轉/倒轉時間(秒)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "快速快轉時速度的倍數"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "高速快轉倍數"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "顏色"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr "{0} {1} 的歷史紀錄"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr "關閉這個對話盒"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr "節點 {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -5988,5 +5339,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6137,40 +5489,708 @@
 msgstr "名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>版本 <strong>{0}</strong> 由 <strong>{2}</strong> 建立於 <strong>{1}</"
+"strong> </html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "版本 {0} 由 {2} 建立於 {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "版本"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "{0} 的圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "讀取 GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "點 {0} x {1} 沒有時刻"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "不能讀取點 {1} x {2} 的時刻「{0}」"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "找不到具可讀時刻戳記的圖片。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "正在讀取 {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "有 Geotag 的圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS 開始：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS 結束：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "目前的差分： {0}秒"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "時區差異： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} 在此軌跡中。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "同步時鐘"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG 圖片 (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "檔案「{0}」的日期無法解析。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "在檔案「{0}」中沒有 EXIF 時刻。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS 單元時區 (不同於照片)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "與 GPS 單元同步時刻"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "輸入的時刻無法解析。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "gps 點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "自訂線條的繪製"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "使用全域設定值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "在這個圖層的各點之間繪出線條。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr "在這個圖層的各點之間不要繪出線條。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "選擇線條繪製選項"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "自訂顏色"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "確定"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "預設值"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "選擇一種顏色"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "已命名點的標記"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} 的已命名軌跡點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "匯入音效"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave 音效檔案 (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} 的音效標記"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "匯入圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} 軌跡， "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} 路線， "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} 航點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "名稱：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "描述：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "長度： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "轉換為資料圖層"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>上傳未經處理的 GPS 資料做為地圖資料被認為是有壞處的。<br>如果您想要上傳"
+"軌跡，請看這裡："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "轉換自：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "從 OSM 沿這條軌跡下載"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "下載這裡面的每個物件："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} 公尺"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "每個要求最大區域："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} 平方公里"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "資料圖層 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "超出下載的區域"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "版本 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "匯入時有 {0} 個衝突。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} 組成："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} 已刪除。)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "取消設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "API 版本： {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "轉換為 GPX 圖層"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "軌跡"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "有 {0} 個點的軌跡"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} 由 {1} 軌跡組成"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} 點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "gps 標記"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "標記"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} 由 {1} 標記組成"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "同步音效"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+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:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "音效同步於點 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr "在播放時無法於圖層同步。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "您需要在軌跡上想標記的點暫停音效。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "這個圖層中沒有既存的音效標記可位移。"
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "無法建立新的音效標記。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "嘗試顯示這個標記的 URL 時發生錯誤"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL 是： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "在顯示 URL 時發生錯誤"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "進階的偏好設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "直接設定偏好設定項目。請小心使用！"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "搜尋： "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "目前的數值是預設值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "預設值是「{0}」。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "預設數值目前不明（設定值尚未使用）。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "請選擇要編輯的列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "{0} 的新數值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "請選擇要刪除的列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "輸入新的設定鍵/數值配對"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "顯示音效選單。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "標籤音效（及圖片、網頁）標記。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "顯示即時音效追蹤。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "讀取 GPX 時建立非音效標記。"
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "具有效時間戳記的明確航點。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "以軌跡位置判斷明確航點的時刻"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "已命名的軌跡點。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "音效檔案的修改次數（時間戳記）。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "軌跡的開頭（如果沒有其他的標記可用就會這麼做）。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "顯示或隱藏主要選單列的音效選單項目。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr "顯示會移動的圖示來顯示出目前播放的音效所記錄同步於軌跡上的點。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr "在音效（和圖片、網頁）標記的按鈕圖示旁放上文字標籤。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr "開啟 GPX 圖層時自動從任何航點製作標記圖層。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "匯入音效時，由此製作標記..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "匯入音效時，將它套用到 GPX 圖層的任何航點中。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr "從軌跡點（非明確的航點）自動建立音效標記，並加上名稱或描述。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr "依據每個匯入的音效 WAV 檔案修改的時刻在軌跡上的位置建立音效標記。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "快轉/倒轉時間(秒)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "快速快轉時速度的倍數"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "高速快轉倍數"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "顏色"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "繪畫樣式 {0}：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "圖層：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "選擇"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "選擇 {0} 的顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "設為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "全部設為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "在 JOSM 中用於不同物件的顏色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6179,29 +6199,29 @@
 msgstr "全部"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "本地端檔案"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "沒有"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "如果沒有匯入區段時強制繪出的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "繪出大型 GPS 點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速率（紅 = 慢，綠 = 快）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置的準確誤差（紅 = 高，綠 = 低，如果可用的話）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "單一顏色（可以為已命名的圖層自訂）"
@@ -6209,5 +6229,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6228,5 +6248,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6264,5 +6284,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6275,50 +6295,50 @@
 msgstr "步行"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "繪出方向箭頭"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "快速繪製（看起來較醜）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "只有重要的方向提示（例如單行道標籤）。"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "只在路徑的開頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "繪製區段順序編號"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "繪出已下載資料的邊界"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "在選擇模式繪出虛擬節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "將未使用的圖層以其他顏色繪製"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "平滑化地圖圖片（反鉅齒）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "在原始 GPS 點之間繪出線條"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6326,34 +6346,34 @@
 msgstr "繪出本地端檔案線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "本地端檔案最大長度（公尺）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../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."
 msgstr "繪出線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "最大長度（公尺）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "如果匯入的資料不含線條資訊，仍強制繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "繪出線條的方向箭頭，連接 GPS 點。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "使用表格查詢的方式繪製方向箭頭而非複雜的數學運算。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6361,13 +6381,13 @@
 msgstr "如果沒有距離最後一個至少這個距離就不要繪出箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（像素）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "將 GPS 點以較大的點繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6375,9 +6395,9 @@
 msgstr "所有的點和軌跡區段都使用同樣的顏色。可以在圖層管理程式自訂。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "依速度來為點和軌跡區段上色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6386,136 +6406,156 @@
 "依位置準確誤差 (HDOP) 來為點和軌跡區段上色。您的記錄裝置必須能記錄該項資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "允許依不同的平均速度調整軌跡顏色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "軌跡與點的顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPS 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "繪出路徑區段的方向提示。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "繪出所有區段在其路徑中的順序編號。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "在地圖檢視套用平滑化以產生較平滑的外觀。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "繪出從伺服器下載資料的邊界。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "為了容易修改路徑在選擇模式中繪出虛擬節點。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "將未使用的資料圖層以不同的顏色繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSM 資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "保留備份檔案"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr "儲存時，在備份檔案名稱的結尾加上 ~"
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "啟動時顯示歡迎畫面"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "在選擇區域清單顯示物件 ID"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "無模式運作（potlath 式）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "不需要切換模式（potlath 式工作流程）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "外觀與感覺"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "預設值（自動決定）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "語言"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "啟用內建預設值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "啟用內建預設值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+msgid "Used style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "設定可用的外掛程式。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "下載的清單"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "更新"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "設定網站..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
 msgstr "加入 JOSM 外掛程式描述 URL。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "請選擇一個項目。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
 msgstr "編輯 JOSM 外掛程式描述 URL。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "設定外掛程式網站"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "顯示設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6523,98 +6563,98 @@
 msgstr "各種影響整個程式視覺呈現的設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "連線設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "OSM 伺服器的連線設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "地圖設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "地圖投影與資料轉譯設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "音效設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "音效播放程式與音效標記的設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "顯示坐標為"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "投影方法"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "地圖投影"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "投影方法"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "顯示坐標為"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "啟用代理伺服器"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "代理伺服器設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "代理伺服器主機"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "代理伺服器連接埠"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "代理伺服器使用者名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "代理伺服器密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSM 伺服器 (REST API) 的基礎 URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr "OSM 帳號的登入名稱 (e-mail)。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "基礎伺服器 URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr "OSM 使用者名稱 (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSM 密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6631,77 +6671,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "捷徑鍵偏好設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "手動改變鍵盤捷徑鍵。"
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "動作"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "描述：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "圖層：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "作者：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "求助：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "版本 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "複製預設值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "請選擇要複製的列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "將新的來源加入清單。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "從清單刪除選取的來源。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "排序預設組合選單"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "啟用內建預設值"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "標籤預設組合來源"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 http://josm."
-"openstreetmap.de/wiki/TaggingPresets 的說明。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "加入新的標籤預設組合來源到清單。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "從清單刪除選取的來源。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "加上預先組合標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "標籤預設組合來源"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "分隔線"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "工具列"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "可用"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "工具列自訂化"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "自訂工具列上的元件。"
@@ -6783,5 +6854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:186
 msgid "Read First"
-msgstr ""
+msgstr "請先閱讀"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:207
@@ -6848,20 +6919,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
 msgid "More information about this feature"
-msgstr ""
+msgstr "更多關於這個功能的資訊"
 
 #. space
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:400
 msgid "Optional Attributes:"
-msgstr ""
+msgstr "額外屬性："
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:444
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
+msgstr "使用群組「{1}」的預設組合「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
 #, java-format
 msgid "Use preset ''{0}''"
-msgstr ""
+msgstr "使用預設組合「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
@@ -6872,5 +6943,5 @@
 #, java-format
 msgid "Unknown type: {0}"
-msgstr ""
+msgstr "不明的類型：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
@@ -6886,5 +6957,5 @@
 #, java-format
 msgid "Error parsing {0}: "
-msgstr ""
+msgstr "分析 {0} 時發生錯誤： "
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
@@ -6959,6 +7030,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -6967,7 +7038,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "檔案 {0} 已存在。是否覆蓋？"
+msgstr "檔案「{0}」不存在"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -6975,5 +7046,5 @@
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "分析檔案「{0}」失敗"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
@@ -6989,5 +7060,5 @@
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
+msgstr "伺服器對 id {0} 傳回回應代碼 404。正在略過它。"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
@@ -7187,5 +7258,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
 msgid "Found <nd> element in non-way."
-msgstr ""
+msgstr "在非-路徑中發現 <nd> 元件。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
@@ -7195,5 +7266,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:222
 msgid "Found <member> element in non-relation."
-msgstr ""
+msgstr "在非-關係中發現 <member> 元件。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
@@ -7219,9 +7290,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
 msgid "Incomplete <member> specification with ref=0"
-msgstr ""
+msgstr "不完整的 <member>> 規格，ref=0"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Illegal object with id=0"
-msgstr ""
+msgstr "不合法的物件，id=0"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315
@@ -7244,5 +7315,5 @@
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-msgstr ""
+msgstr "忽略路徑，因為它包含不存在的節點：{0}\n"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495
@@ -7278,26 +7349,28 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
-msgstr ""
+"use changesets, but API is not able to handle them. Ignoring changesets."
+msgstr ""
+"警告：偏好設定「{0}」或資料組合的 api 版本「{1}」要求使用變更組合，但 API 不"
+"處理它們。正在略過變更組合。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳 {4}: {5} (id: {6})"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "更新外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "下載外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7310,5 +7383,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -7316,23 +7389,23 @@
 msgstr[0] "已成功下載 {0} 個外掛程式。請重新啟動 JOSM。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "正在下載外掛程式 {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
 msgid "Skip download"
 msgstr "略過下載"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "JOSM 第 {0} 版需要外掛程式 {1}。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Download Plugin"
 msgstr "下載外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr "略過下載"
@@ -7380,6 +7453,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "停用外掛程式"
@@ -7394,5 +7467,5 @@
 msgstr "保留外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7400,5 +7473,5 @@
 msgstr "啓用更新的外掛程式失敗。請檢查 JOSM 是否有覆蓋既存項目的權限。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
@@ -7406,19 +7479,19 @@
 msgstr "發生未預期的例外，可能來自「{0}」外掛程式。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "根據此外掛程式的資訊，作者是 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr "在回報程式錯誤前請先嘗試將外掛程式升級到最新版本。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "是否停用此外掛程式？"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7426,5 +7499,5 @@
 msgstr "該外掛程式已從組態中移除。請重新啟動 JOSM 以卸載外掛程式。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7432,19 +7505,19 @@
 msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "資訊"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "沒有描述可用"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "更多詳細資料"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7452,13 +7525,13 @@
 msgstr[0] "從 {0} 網站下載的外掛程式資訊"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+msgstr "找不到外掛程式資訊。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+msgstr "所有已安裝的外掛程式都是最新版。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7467,10 +7540,13 @@
 "{0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+"更新下列外掛程式：\n"
+"\n"
+"{0}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+msgstr "下載缺少的外掛程式"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7479,7 +7555,10 @@
 "{0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+"是否下載下列外掛程式？\n"
+"\n"
+"{0}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7502,25 +7581,25 @@
 msgstr "不明"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+msgstr "{0}：版本 {1}{2}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+msgstr "JOSM 隨附外掛程式"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
-msgstr ""
+msgstr "讀取外掛程式資訊檔案時發生錯誤：{0}"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299
 msgid "This is after the end of the recording"
-msgstr ""
+msgstr "這已在記錄的結尾之後"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339
 msgid "Error playing sound"
-msgstr ""
+msgstr "播放音效時發生錯誤"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
@@ -7530,5 +7609,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid "Report Bug"
-msgstr ""
+msgstr "回報程式錯誤"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
@@ -7539,17 +7618,21 @@
 "version of JOSM, please consider being kind and file a bug report."
 msgstr ""
+"發生未預期的例外。\n"
+"\n"
+"這常常是程式編寫的錯誤。如果您執行的是\n"
+"最新版 JOSM，請不吝提供程式錯誤回報。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid "Unexpected Exception"
-msgstr ""
+msgstr "未預期的例外"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
 #, java-format
 msgid "Please report a ticket at {0}"
-msgstr ""
+msgstr "請在 {0} 回報為 ticket"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
 msgid "Include your steps to get to the error (as detailed as possible)!"
-msgstr ""
+msgstr "包含您導致此錯誤的步驟（愈詳細愈好）！"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
@@ -7557,13 +7640,13 @@
 "Try updating to the newest version of JOSM and all plugins before reporting "
 "a bug."
-msgstr ""
+msgstr "在回報錯誤前請先試著更新到最新版的 JOSM 與所有外掛程式。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid "Be sure to include the following information:"
-msgstr ""
+msgstr "請確認包含下列資訊："
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74
 msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
+msgstr "（該文字已複製到您的剪貼簿中。）"
 
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32
@@ -7578,4 +7661,7 @@
 "\n"
 msgstr ""
+"將鍵盤捷徑鍵「{0}」設定為動作「{1}」({2})失敗\n"
+"因為該捷徑鍵已用於動作「{3}」({4})。\n"
+"\n"
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445
@@ -7584,4 +7670,6 @@
 "\n"
 msgstr ""
+"這個動作沒有捷徑鍵。\n"
+"\n"
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
@@ -7591,12 +7679,14 @@
 "\n"
 msgstr ""
+"使用捷徑鍵「{0}」代替。\n"
+"\n"
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
-msgstr ""
+msgstr "（提示：您可以在偏好設定中編輯捷徑鍵。）"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
 msgid "Create grid of ways"
-msgstr ""
+msgstr "建立路徑的格線"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -7608,5 +7698,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "選擇兩條有共同節點的路徑"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
@@ -7616,9 +7706,9 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
 msgid "Create a grid of ways"
-msgstr ""
+msgstr "建立路徑的格線"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74
 msgid "Upload Trace"
-msgstr ""
+msgstr "上傳軌跡"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85
@@ -7626,5 +7716,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 msgid "Upload Traces"
-msgstr ""
+msgstr "上傳軌跡"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
@@ -7634,5 +7724,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103
 msgid "Selected makes your trace public in openstreetmap.org"
-msgstr ""
+msgstr "選擇讓您的軌跡在　openstreetmap.org 上公開"
 
 #. item "Relations/Route" text "Symbol description"
@@ -7644,14 +7734,14 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
 msgid "Please enter Description about your trace."
-msgstr ""
+msgstr "請輸入您的軌跡的相關描述。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109
 msgid "Please enter tags about your trace."
-msgstr ""
+msgstr "請輸入您的軌跡的標籤。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154
 #, java-format
 msgid "Selected track: {0}"
-msgstr ""
+msgstr "選取的軌跡：{0}"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177
@@ -7669,23 +7759,23 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
 msgid "GPX upload was successful"
-msgstr ""
+msgstr "GPX 上傳成功"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262
 msgid "Upload failed. Server returned the following message: "
-msgstr ""
+msgstr "上傳失敗。伺服器傳回下列訊息： "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr ""
+msgstr "正在上傳 GPX 軌跡：{0}% ({1} / {2})"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336
 msgid "No description provided. Please provide some description."
-msgstr ""
+msgstr "沒有提供描述。請提供一些描述。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361
 msgid "No GPX layer selected. Cannot upload a trace."
-msgstr ""
+msgstr "沒有選取 GPX 圖層。不能上傳軌跡。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342
@@ -7699,39 +7789,39 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377
 msgid "Uploading GPX Track"
-msgstr ""
+msgstr "正在上傳 GPX 軌跡"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 msgid "Uploads traces to openstreetmap.org"
-msgstr ""
+msgstr "上傳軌跡至 openstreetmap.org"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr ""
+msgstr "AgPifoJ - 有 Geotag 的相片"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "Display geotagged photos"
-msgstr ""
+msgstr "顯示有 Geotag 的相片"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
-msgstr ""
+msgstr "上一幅"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78
 msgid "Remove photo from layer"
-msgstr ""
+msgstr "從圖層移除相片"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
-msgstr ""
+msgstr "下一幅"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
 msgid "Center view"
-msgstr ""
+msgstr "置中檢視"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
 msgid "Zoom best fit and 1:1"
-msgstr ""
+msgstr "最適與 1:1 縮放"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
@@ -7741,4 +7831,6 @@
 "Altitude: {0} m"
 msgstr ""
+"\n"
+"高度： {0} m"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169
@@ -7751,66 +7843,66 @@
 "{0} 公里/小時"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+msgstr "從 EXIF 中解出 GPS 位置"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+msgstr "開始掃描目錄"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+msgstr "選取的檔案其中之一是空的！！！"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+msgstr "讀取相片..."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+msgstr "無法取得目錄  {0} 的路徑\n"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+msgstr "正在掃描目錄 {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+msgstr "在目錄 {0} 找到空的檔案\n"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+msgstr "從目錄 {0} 取得檔案時發生錯誤\n"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+msgstr "關聯到 GPX"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
-msgstr ""
+msgstr "已發現 {0} 具有 GPS 標籤。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
 msgid "Open images with AgPifoJ..."
-msgstr ""
+msgstr "以 AgPifoJ 開啟圖片..."
 
 #: ../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."
-msgstr ""
+msgstr "將多組圖片載入為新的圖層。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131
 msgid "GPX Files (*.gpx *.gpx.gz)"
-msgstr ""
+msgstr "GPX 檔案 (*.gpx *.gpx.gz)"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr ""
+msgstr "檔案 {0} 已經以「{1}」的名稱載入了。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170
@@ -7825,12 +7917,14 @@
 "on the photo and select a timezone<hr></html>"
 msgstr ""
+"<html>配合您的 GPS 接收器拍照，它會顯示時刻。<br>在這裡顯示照片。<br>然後，根"
+"據您讀取到的相片時刻並選擇時區<hr></html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228
 msgid "Photo time (from exif):"
-msgstr ""
+msgstr "相片時刻 (取自 exif):"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243
 msgid "Gps time (read from the above photo): "
-msgstr ""
+msgstr "Gps 時刻（自上列相片讀取）： "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255
@@ -7840,5 +7934,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263
 msgid "I'm in the timezone of: "
-msgstr ""
+msgstr "我所在的時區： "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326
@@ -7849,9 +7943,9 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335
 msgid "Open an other photo"
-msgstr ""
+msgstr "開啟其他相片"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374
 msgid "Synchronize time from a photo of the GPS receiver"
-msgstr ""
+msgstr "從 GPS 接收器的相片同步時間"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385
@@ -7860,4 +7954,6 @@
 "Please use the requested format"
 msgstr ""
+"分析日期時發生錯誤。\n"
+"請使用要求的格式"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387
@@ -7867,13 +7963,13 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430
 msgid "<No GPX track loaded yet>"
-msgstr ""
+msgstr "<尚未載入 GPX 軌跡>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436
 msgid "GPX track: "
-msgstr ""
+msgstr "GPX 軌跡： "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441
 msgid "Open another GPX trace"
-msgstr ""
+msgstr "開啟另一個 GPX 軌跡"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457
@@ -7883,13 +7979,13 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479
 msgid "Offset:"
-msgstr ""
+msgstr "位移："
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491
 msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-msgstr ""
+msgstr "<html>我的 GPS 接收器可以拍照。<br>這樣有幫助嗎？</html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508
 msgid "Update position for: "
-msgstr ""
+msgstr "更新位置： "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517
@@ -7899,29 +7995,29 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
 msgid "Images with no exif position"
-msgstr ""
+msgstr "圖片沒有 exif 位置"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537
 msgid "Not yet tagged images"
-msgstr ""
+msgstr "尚未加上標籤的圖片"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557
 msgid "Correlate images with GPX track"
-msgstr ""
+msgstr "將圖片與 GPX 軌跡關聯"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
 msgid "Correlate"
-msgstr ""
+msgstr "關聯"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
 msgid "Auto-Guess"
-msgstr ""
+msgstr "自動猜測"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569
 msgid "You should select a GPX track"
-msgstr ""
+msgstr "您應該選擇一個 GPX 軌跡"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570
 msgid "No selected GPX track"
-msgstr ""
+msgstr "沒有選取的 GPX 軌跡"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582
@@ -7931,8 +8027,10 @@
 "Expected format: {0}"
 msgstr ""
+"分析時區時發生錯誤。\n"
+"預期的格式：{0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583
 msgid "Invalid timezone"
-msgstr ""
+msgstr "無效的時區"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595
@@ -7942,82 +8040,84 @@
 "Expected format: {0}"
 msgstr ""
+"在分析補償時發生錯誤。\n"
+"預期的格式：{0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596
 msgid "Invalid offset"
-msgstr ""
+msgstr "無效的移位"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
-msgstr ""
+msgstr "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640
 msgid "GPX Track loaded"
-msgstr ""
+msgstr "GPX 軌跡已載入"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675
 msgid "The selected photos don't contain time information."
-msgstr ""
+msgstr "選取的相片未包含時刻資訊。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676
 msgid "Photos don't contain time information"
-msgstr ""
+msgstr "相片未包含時刻資訊"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
-msgstr ""
+msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714
 msgid "GPX Track has no time information"
-msgstr ""
+msgstr "GPX 軌跡沒有時刻資訊"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759
 #, java-format
 msgid "Timezone: {0}"
-msgstr ""
+msgstr "時區：{0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760
 #, java-format
 msgid "Minutes: {0}"
-msgstr ""
+msgstr "分鐘：{0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761
 #, java-format
 msgid "Seconds: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+msgstr "秒鐘：{0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+msgstr "已比對 {1} 張相片中的 {0} 張到 GPX 軌跡。"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+msgstr "({0} 天的時間差異)"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+msgstr "在軌跡與相片間的補償：{0}分 {1}秒"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+msgstr "比對相片至軌跡失敗"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+msgstr "調整時區並補償"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
-msgstr ""
+msgstr "預設值"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433
@@ -8028,5 +8128,5 @@
 #, java-format
 msgid "Loading {0}"
-msgstr ""
+msgstr "正在載入 {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:445
@@ -8034,26 +8134,26 @@
 #, java-format
 msgid "Error on file {0}"
-msgstr ""
+msgstr "檔案 {0} 有錯誤"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
-msgstr ""
+msgstr "載入檔案有錯誤"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:16
 msgid "Lambert Zone 1 cache file (.1)"
-msgstr ""
+msgstr "蘭勃特區 1 快取檔案 (.1)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17
 msgid "Lambert Zone 2 cache file (.2)"
-msgstr ""
+msgstr "蘭勃特區 2 快取檔案 (.2)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18
 msgid "Lambert Zone 3 cache file (.3)"
-msgstr ""
+msgstr "蘭勃特區 3 快取檔案 (.3)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19
 msgid "Lambert Zone 4 cache file (.4)"
-msgstr ""
+msgstr "蘭勃特區 4 快取檔案 (.4)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43
@@ -8061,5 +8161,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165
 msgid "CadastreGrabber: Illegal url."
-msgstr ""
+msgstr "CadastreGrabber: 不合法的 url。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:65
@@ -8069,8 +8169,10 @@
 "Please check its availibility on www.cadastre.gouv.fr"
 msgstr ""
+"城/鎮 {0} 在 WMS 中找不到或無法使用。\n"
+"請在 www.cadastre.gouv.fr 中檢查它的可用性"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283
 msgid "Choose from..."
-msgstr ""
+msgstr "選擇自..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:292
@@ -8084,9 +8186,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
 msgid "Cadastre"
-msgstr ""
+msgstr "Cadastre"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
 msgid "Auto sourcing"
-msgstr ""
+msgstr "自動來源"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
@@ -8097,5 +8199,5 @@
 #, java-format
 msgid "Change the projection to {0} first."
-msgstr ""
+msgstr "先將投影改變為 {0}。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:170
@@ -8104,4 +8206,6 @@
 "the JOSM projection to Lambert and restart"
 msgstr ""
+"要啓用 cadastre WMS 外掛程式，請將\n"
+"JOSM 投影改為蘭勃特投影後重新啟動"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
@@ -8111,36 +8215,39 @@
 "Would you like to restore F11 for grab action ?"
 msgstr ""
+"外掛程式 cadastre-fr 一般使用功能鍵 F11 為捷徑鍵\n"
+"但它目前是預設分配給全螢幕切換使用\n"
+"您是否想要回復以 F11 作為抓取動作？"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "Restore grab shortcut F11"
-msgstr ""
+msgstr "回復抓取捷徑鍵 F11"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid "JOSM is stopped for the change to take effect."
-msgstr ""
+msgstr "JOSM 已停止以便讓變更生效。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
 msgid "Replace original background by JOSM background color."
-msgstr ""
+msgstr "以 JOSM 背景顏色取代原始背景。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
 msgid "Reverse grey colors (for black backgrounds)."
-msgstr ""
+msgstr "反轉灰色（用於黑色背景）。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
 msgid "Set background transparent."
-msgstr ""
+msgstr "設定背景透明度。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Draw boundaries of downloaded data."
-msgstr ""
+msgstr "繪出已下載資料的邊界。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
 msgid "Enable automatic caching."
-msgstr ""
+msgstr "啟用自動快取。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
 msgid "Max. cache size (in MB)"
-msgstr ""
+msgstr "最大快取容量 (MB)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55
@@ -8156,9 +8263,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "French cadastre WMS"
-msgstr ""
+msgstr "法國 cadastre WMS"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr ""
+msgstr "<html>當自動來源啓用時設定鍵「source」的數值</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
@@ -8171,5 +8278,5 @@
 "Replace the original white background by the backgound color defined in JOSM "
 "preferences."
-msgstr ""
+msgstr "將原始的白色背景以在 JOSM 偏好設定中定義的背景顏色取代。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
@@ -8177,17 +8284,17 @@
 "Invert the original black and white colors (and all intermediate greys). "
 "Useful for texts on dark backgrounds."
-msgstr ""
+msgstr "反轉原始的黑色與白色（和所有中間的灰色）。當文字在暗色背景中時很有用。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87
 msgid "Allows multiple layers stacking"
-msgstr ""
+msgstr "允許多重圖層堆疊"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
-msgstr ""
+msgstr "設定 WMS 圖層透明度。右邊是不透明，左邊是透明。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102
 msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr ""
+msgstr "在從 WMS 伺服器下載的資料周圍繪出一個矩形。"
 
 #. the downloaded images multiplier
@@ -8199,25 +8306,25 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125
 msgid "Grab smaller images (higher quality but use more memory)"
-msgstr ""
+msgstr "抓取較小的圖片（較高的品質但消耗更多記憶體）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
 msgid "Fixed size square (default is 100m)"
-msgstr ""
+msgstr "固定大小矩形（預設為 100m）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
 msgid "Fixed size (from 25 to 1000 meters)"
-msgstr ""
+msgstr "固定大小（從 25 到 100 公尺）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
 msgid "Oldest files are automatically deleted when this size is exceeded"
-msgstr ""
+msgstr "當超過這個大小時較舊的檔案會自動刪除"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
 msgid "Auto-tag source added:"
-msgstr ""
+msgstr "自動標籤來源已加入："
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83
 msgid "Add \"source=...\" to elements?"
-msgstr ""
+msgstr "將「source=...」加入元件？"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44
@@ -8226,5 +8333,5 @@
 #, java-format
 msgid "Downloading {0}"
-msgstr ""
+msgstr "正在下載 {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52
@@ -8232,9 +8339,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
 msgid "Contacting WMS Server..."
-msgstr ""
+msgstr "正在連接 WMS 伺服器..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
 msgid "Create buildings"
-msgstr ""
+msgstr "建立建築"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264
@@ -8243,4 +8350,6 @@
 "building import size is limited to 1 km2 max."
 msgstr ""
+"要避免 cadastre WMS 超載，\n"
+"建築匯入的大小限制在最大 1 km2。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
@@ -8251,13 +8360,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
 msgid "Extract SVG ViewBox..."
-msgstr ""
+msgstr "解開 SVG ViewBox..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
 msgid "Extract best fitting boundary..."
-msgstr ""
+msgstr "解出最合適的邊界..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
 msgid "Create boundary"
-msgstr ""
+msgstr "建立邊界"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
@@ -8268,51 +8377,51 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
 msgid "Only on vectorized layers"
-msgstr ""
+msgstr "只在向量式圖層"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
 msgid "Extract building footprints"
-msgstr ""
+msgstr "解開建築足跡"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
 msgid "Download Image from French Cadastre WMS"
-msgstr ""
+msgstr "從法國 Cadastre WMS 下載圖片"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
 #, java-format
 msgid "Cadastre: {0}"
-msgstr ""
+msgstr "Cadastre: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
 msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-msgstr ""
+msgstr "手動設定藍勃特區（例如用於兩個區域間的位置）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33
 msgid "Zone"
-msgstr ""
+msgstr "區域"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
 msgid "Lambert zone"
-msgstr ""
+msgstr "蘭勃特區"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19
 msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgstr "從快取載入位置（只有在快取已啟用時）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
-msgstr ""
+msgstr "改變位置"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
-msgstr ""
+msgstr "為下個要求設定新的位置"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38
 msgid "Open a layer first (GPX, OSM, cache)"
-msgstr ""
+msgstr "先開啓圖層　(GPX, OSM, 快取)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
 msgid "Add a new layer"
-msgstr ""
+msgstr "加入新的圖層"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52
@@ -8325,16 +8434,18 @@
 "known by www.cadastre.gouv.fr .</html>"
 msgstr ""
+"<html>輸入鎮、鄉或城市名稱。<br>使用在 www.cadastre.gouv.fr 已知的語法及標"
+"點。</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
 msgid "Add new layer"
-msgstr ""
+msgstr "加入新的圖層"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
 msgid "Reset cookie"
-msgstr ""
+msgstr "重設 cookie"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
 msgid "Get a new cookie (session timeout)"
-msgstr ""
+msgstr "取得新的 cookie（作業階段逾時）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58
@@ -8343,6 +8454,5 @@
 msgid "Simplify Way (remove {0} node)"
 msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "簡化路徑（移除 {0} 個節點）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
@@ -8359,5 +8469,5 @@
 #, java-format
 msgid "Download WMS tile from {0}"
-msgstr ""
+msgstr "從 {0} 下載 WMS 拼貼"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43
@@ -8366,19 +8476,21 @@
 "Select one of them first, then retry"
 msgstr ""
+"發現一個以上的　WMS 圖層\n"
+"請先選擇它們中的一個，然後重試"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
-msgstr ""
+msgstr "空白圖層"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:176
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
+msgstr "WMS 圖層 ({0})，已載入 {1} 個拼貼"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 msgid "Is not vectorized."
-msgstr ""
+msgstr "並非向量化的。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:179
@@ -8389,5 +8501,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 msgid "Is vectorized."
-msgstr ""
+msgstr "是向量化的。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:182
@@ -8402,17 +8514,19 @@
 "Create a new one."
 msgstr ""
+"不支援的快取檔案版本；找到 {0}，應為 {1}\n"
+"建立一個新的。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Format Error"
-msgstr ""
+msgstr "快取格式錯誤"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
+msgstr "快取中的蘭勃特區 {0} 與目前的蘭勃特區 {1} 不相容"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419
 msgid "Cache Lambert Zone Error"
-msgstr ""
+msgstr "快取蘭勃特區發生錯誤"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -8422,5 +8536,5 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
 msgid "Please select a scheme to use."
-msgstr ""
+msgstr "請選擇要使用的配置。"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
@@ -8430,31 +8544,31 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
 msgid "Please select the scheme to delete."
-msgstr ""
+msgstr "請選擇要刪除的配置。"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
 msgid "Use the selected scheme from the list."
-msgstr ""
+msgstr "使用從清單選取的配置。"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the current colors as a new color scheme."
-msgstr ""
+msgstr "使用目前的顏色作為新的顏色配置。"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Delete the selected scheme from the list."
-msgstr ""
+msgstr "從清單中刪除選取的配置。"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
 msgid "Color Schemes"
-msgstr ""
+msgstr "顏色配置"
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 msgid "Split area"
-msgstr ""
+msgstr "分離區域"
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
 msgid "Splits an area by an untagged way."
-msgstr ""
+msgstr "以未加標籤的路徑分離出區域。"
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76
@@ -8464,56 +8578,60 @@
 "Remove the area from the relation before splitting it."
 msgstr ""
+"選取的區域不能分離，因為它是某個關係的成員。\n"
+"在分離它之前請先將區域自關係中移除。"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS 檔案 (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr "格式錯誤： "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "TangoGPS 匯入成功"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "TangoGPS 匯入失敗！"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "Checksum 錯誤: "
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEA 匯入成功"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "NMEA 匯入失敗！"
+msgid "TCX Files (*.tcx)"
+msgstr "TangoGPS 檔案 (*.log)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
 msgid "Duplicate Way"
-msgstr ""
+msgstr "重製路徑"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:76
 msgid "Duplicate selected ways."
-msgstr ""
+msgstr "重製選取的路徑。"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
 msgid "Can't duplicate unordered way."
-msgstr ""
+msgstr "不能重製未排序的路徑。"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
 msgid "You must select at least one way."
-msgstr ""
+msgstr "您必須選擇至少一條路徑。"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:240
 msgid "Create duplicate way"
-msgstr ""
-
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+msgstr "建立重複的路徑"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
-msgstr ""
+msgstr "編輯 GPX 軌跡的圖層"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
 msgid "Convert to GPX layer with anonymised time"
-msgstr ""
+msgstr "轉換為沒有時刻的 GPX 圖層"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46
 msgid "edit gpx tracks"
-msgstr ""
+msgstr "編輯 gpx 軌跡"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85
@@ -8524,11 +8642,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "從 GPX 圖層匯入路徑"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr ""
@@ -8537,60 +8655,60 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
-msgstr ""
+msgstr "找不到 GPX 資料圖層。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
-msgstr ""
+msgstr "只有位置"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82
 msgid "Position, Time, Date, Speed"
-msgstr ""
+msgstr "位置, 時刻, 日期, 速度"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83
 msgid "Position, Time, Date, Speed, Altitude"
-msgstr ""
+msgstr "位置, 時刻, 日期, 速度, 高度"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
 msgid "A By Time"
-msgstr ""
+msgstr "A 依時刻"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
 msgid "A By Distance"
-msgstr ""
+msgstr "A 依距離"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
 msgid "B By Time"
-msgstr ""
+msgstr "B 依時刻"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
 msgid "B By Distance"
-msgstr ""
+msgstr "B 依距離"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
 msgid "C By Time"
-msgstr ""
+msgstr "C 依時刻"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
 msgid "C By Distance"
-msgstr ""
+msgstr "C 依距離"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
 msgid "Data Logging Format"
-msgstr ""
+msgstr "資料記錄格式"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
 msgid "Disable data logging if speed falls below"
-msgstr ""
+msgstr "停用資料記錄速限"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
 msgid "Disable data logging if distance falls below"
-msgstr ""
+msgstr "停用資料記錄距離"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
 msgid "Unknown logFormat"
-msgstr ""
+msgstr "不明的記錄格式"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
@@ -8599,6 +8717,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "重新整理"
@@ -8606,9 +8724,9 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100
 msgid "refresh the port list"
-msgstr ""
+msgstr "重新整理連接埠清單"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108
 msgid "Configure"
-msgstr ""
+msgstr "設定"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:116
@@ -8618,38 +8736,38 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:125
 msgid "Connection Error."
-msgstr ""
+msgstr "連線錯誤。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:130
 msgid "configure the connected DG100"
-msgstr ""
+msgstr "設定連接的 DG100"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
 msgid "delete data after import"
-msgstr ""
+msgstr "匯入後删除資料"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48
 msgid "Importing data from device."
-msgstr ""
+msgstr "從裝置匯入資料"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
 msgid "Importing data from DG100..."
-msgstr ""
+msgstr "從 DG100 匯入資料..."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
 msgid "Error deleting data."
-msgstr ""
+msgstr "刪除資料時發生錯誤。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74
 #, java-format
 msgid "imported data from {0}"
-msgstr ""
+msgstr "資料已從 {0} 匯入"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77
 msgid "No data found on device."
-msgstr ""
+msgstr "在裝置上找不到資料。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82
 msgid "Connection failed."
-msgstr ""
+msgstr "連線失敗。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101
@@ -8659,13 +8777,15 @@
 "plugin/"
 msgstr ""
+"不能載入 rxtxSerial 程式庫。如果您需要安裝上的支援，試試在 http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/ 的 Globalsat 首頁"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
 msgid "Globalsat Import"
-msgstr ""
+msgstr "Globalsat 匯入"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr ""
+msgstr "從 Globalsat Datalogger DG100 匯入資料到 GPX 圖層。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119
@@ -8675,9 +8795,9 @@
 #: ../plugins/grid/src/grid/GridLayer.java:192
 msgid "Grid origin location"
-msgstr ""
+msgstr "格線原始位置"
 
 #: ../plugins/grid/src/grid/GridLayer.java:197
 msgid "Grid rotation"
-msgstr ""
+msgstr "格線旋轉"
 
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -8687,13 +8807,13 @@
 #: ../plugins/grid/src/grid/GridLayer.java:200
 msgid "Grid layout"
-msgstr ""
+msgstr "格線配置"
 
 #: ../plugins/grid/src/grid/GridLayer.java:222
 msgid "Grid layer:"
-msgstr ""
+msgstr "格線圖層："
 
 #: ../plugins/grid/src/grid/GridPlugin.java:27
 msgid "Add grid"
-msgstr ""
+msgstr "加入格線"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
@@ -8703,13 +8823,13 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:57
 msgid "Rotate 90"
-msgstr ""
+msgstr "旋轉 90 度"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:59
 msgid "Rotate 180"
-msgstr ""
+msgstr "旋轉 180 度"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:61
 msgid "Rotate 270"
-msgstr ""
+msgstr "旋轉 270 度"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:108
@@ -8723,30 +8843,30 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144
 msgid "Rotate left"
-msgstr ""
+msgstr "向左旋轉"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146
 msgid "Rotate image left"
-msgstr ""
+msgstr "將圖片向左旋轉"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163
 msgid "Rotate right"
-msgstr ""
+msgstr "向右旋轉"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165
 msgid "Rotate image right"
-msgstr ""
+msgstr "將圖片向右旋轉"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 msgid "WayPoint Image"
-msgstr ""
+msgstr "航點圖片"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
 msgid "Display non-geotagged photos"
-msgstr ""
+msgstr "顯示無 geotag 的相片"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74
 msgid "Imported Images"
-msgstr ""
+msgstr "匯入的圖片"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:35
@@ -8756,44 +8876,44 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:45
 msgid "Open images with ImageWayPoint"
-msgstr ""
+msgstr "以 ImageWayPoing 開啟圖片"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81
 msgid "Direction index '{0}' not found"
-msgstr ""
+msgstr "找不到方向索引「{0}」"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108
 msgid "The starting location was not within the bbox"
-msgstr ""
+msgstr "開始的位置不在 bbox 內"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
 msgid "Looking for shoreline..."
-msgstr ""
+msgstr "尋找海岸線..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145
 #, java-format
 msgid "{0} nodes so far..."
-msgstr ""
+msgstr "目前 {0} 個節點..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 msgid "Lake Walker."
-msgstr ""
+msgstr "Lake Walker。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
-msgstr ""
+msgstr "Lake Walker"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
 #, java-format
 msgid "Error creating cache directory: {0}"
-msgstr ""
+msgstr "建立快取目錄時發生錯誤：{0}"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
 msgid "Tracing"
-msgstr ""
+msgstr "正在追蹤"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
-msgstr ""
+msgstr "正在檢查快取..."
 
 #. *
@@ -8810,5 +8930,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
 msgid "Running Douglas-Peucker approximation..."
-msgstr ""
+msgstr "執行近似 Douglas-Peucker..."
 
 #. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
@@ -8818,14 +8938,14 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 msgid "Removing duplicate nodes..."
-msgstr ""
+msgstr "正在移除重複的節點..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112
 msgid "Lakewalker trace"
-msgstr ""
+msgstr "Lakewalker 軌跡"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
 msgid "An unknown error has occurred"
-msgstr ""
+msgstr "發生不明的錯誤"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -8904,17 +9024,17 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
-msgstr ""
+msgstr "水域"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "coastline"
-msgstr ""
+msgstr "海岸線"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "land"
-msgstr ""
+msgstr "陸地"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
@@ -8924,61 +9044,61 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
 msgid "Maximum number of segments per way"
-msgstr ""
+msgstr "每路徑的最大區段數"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of nodes in initial trace"
-msgstr ""
+msgstr "初始化軌跡的最大節點數"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum gray value to count as water (0-255)"
-msgstr ""
+msgstr "判斷為水域的最大灰色值 (0-255)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Line simplification accuracy (degrees)"
-msgstr ""
+msgstr "線條簡化準確度（度）"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr ""
+msgstr "Landsat 拼貼的解析度（每一度的像素）"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Size of Landsat tiles (pixels)"
-msgstr ""
+msgstr "Landsat 拼貼的大小（像素）"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Shift all traces to east (degrees)"
-msgstr ""
+msgstr "所有軌跡向東平移（度）"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to north (degrees)"
-msgstr ""
+msgstr "所有軌跡向北平移（度）"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Direction to search for land"
-msgstr ""
+msgstr "搜尋陸地的方向"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Tag ways as"
-msgstr ""
+msgstr "將路徑標記為"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "WMS Layer"
-msgstr ""
+msgstr "WMS 圖層"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "Maximum cache size (MB)"
-msgstr ""
+msgstr "最大快取大小 (MB)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache age (days)"
-msgstr ""
+msgstr "最大快取留存時間（天）"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Source text"
-msgstr ""
+msgstr "來源文字"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
 msgid "Maximum number of segments allowed in each generated way. Default 250."
-msgstr ""
+msgstr "在每個產生的路徑中允許的最大區段數。預設為 250。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
@@ -8993,4 +9113,6 @@
 "in the range 0-255. Default 90."
 msgstr ""
+"被認定為水域的最大灰色數值（基於 Landsat IR-1 資料。可以是範圍 0-255。預設值"
+"為 90。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
@@ -8999,70 +9121,72 @@
 "<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 msgstr ""
+"Douglas-Peucker 線條簡化的準確度，以度為測量單位。<br>較低的數值會產生較多的"
+"節點，和更準確的線條。預設值為 0.0003。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
-msgstr ""
+msgstr "Landsat 拼貼的解析度，以每一度像素為測量單位。預設值為 4000。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr ""
+msgstr "一個 landsat 拼貼的大小，以像素為測量單位。預設值為 2000。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Offset all points in East direction (degrees). Default 0."
-msgstr ""
+msgstr "所有點向東方移位（度）。預設值為 0。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in North direction (degrees). Default 0."
-msgstr ""
+msgstr "所有點向北方移位（度）。預設值為 0。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Direction to search for land. Default east."
-msgstr ""
+msgstr "搜尋陸地方向。預設值為東方。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr ""
+msgstr "將路徑加上標籤成為水域、海岸線、陸地或都不是。預設值為水域。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr ""
+msgstr "再次追蹤時要使用的 WMS 圖層。預設值為 IR1。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr ""
+msgstr "每個快取目錄的最大容量(位元組)。預設值為 300MB"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum age of each cached file in days. Default is 100"
-msgstr ""
+msgstr "每個快取檔案留存的最大天數。預設值為 100"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Data source text. Default is Landsat."
-msgstr ""
+msgstr "資料來源文字。預設值為 Landsat。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr ""
+msgstr "用來追蹤 Landsat 圖庫中水域的外掛程式。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "Lakewalker Plugin Preferences"
-msgstr ""
+msgstr "Lakewalker 外掛程式偏好設定"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45
 msgid "Downloading image tile..."
-msgstr ""
+msgstr "正在下載圖片拼貼..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148
 msgid "Could not acquire image"
-msgstr ""
+msgstr "無法擷取圖片"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:128
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:144
 msgid "Connecting"
-msgstr ""
+msgstr "正在連線"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:204
 msgid "Connected"
-msgstr ""
+msgstr "已連線"
 
 #. not connected:
@@ -9070,18 +9194,18 @@
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:232
 msgid "Not connected"
-msgstr ""
+msgstr "未連線"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
 msgid "Connection Failed"
-msgstr ""
+msgstr "連線失敗"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 msgid "Live GPS"
-msgstr ""
+msgstr "Live GPS"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
 msgid "Show GPS data."
-msgstr ""
+msgstr "顯示 GPS 資料。"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:50
@@ -9091,5 +9215,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:52
 msgid "Way Info"
-msgstr ""
+msgstr "路徑資訊"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:58
@@ -9099,9 +9223,9 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:60
 msgid "Course"
-msgstr ""
+msgstr "道路"
 
 #: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
 msgid "LiveGPS layer"
-msgstr ""
+msgstr "LiveGPS 圖層"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
@@ -9109,39 +9233,39 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Capture GPS Track"
-msgstr ""
+msgstr "擷取 GPS 軌跡"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
+msgstr "連線至 gpsd 伺服器並在 LiveGPS 圖層中顯示目前的位置。"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center Once"
-msgstr ""
+msgstr "置中一次"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 msgid "Center the LiveGPS layer to current position."
-msgstr ""
+msgstr "將 LiveGPS 圖層置中於目前的位置。"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
 msgid "Auto-Center"
-msgstr ""
+msgstr "自動置中"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
 msgid "Continuously center the LiveGPS layer to current position."
-msgstr ""
+msgstr "持續將 LiveGPS 圖層置中到目前的位置。"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
 msgid "LiveGPS"
-msgstr ""
+msgstr "LiveGPS"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
 msgid "Measured values"
-msgstr ""
+msgstr "測量的數值"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
 msgid "Open the measurement window."
-msgstr ""
+msgstr "開啟測量視窗。"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
@@ -9151,37 +9275,37 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:73
 msgid "Reset current measurement results and delete measurement path."
-msgstr ""
+msgstr "重設目前的測量結果並刪除測量路徑。"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:79
 msgid "Path Length"
-msgstr ""
+msgstr "路徑長度"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:84
 msgid "Selection Length"
-msgstr ""
+msgstr "選擇區域長度"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:89
 msgid "Selection Area"
-msgstr ""
+msgstr "選擇區域"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:94
 msgid "Angle"
-msgstr ""
+msgstr "角度"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:95
 msgid "Angle between two selected Nodes"
-msgstr ""
+msgstr "兩個已取選節點間的角度"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:60
 msgid "Layer to make measurements"
-msgstr ""
+msgstr "要進行測量的圖層"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java:47
 msgid "Can not draw outside of the world."
-msgstr ""
+msgstr "不能畫到這個世界以外的地方。"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20
 msgid "measurement mode"
-msgstr ""
+msgstr "測量模式"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36
@@ -9191,13 +9315,13 @@
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
-msgstr ""
+msgstr "OpenLayers"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
 msgid "OpenStreetBugs download loop"
-msgstr ""
+msgstr "OpenStreetBugs 下載迴圈"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
-msgstr ""
+msgstr "顯示 OpenStreetBugs 議題"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
@@ -9207,8 +9331,10 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>openstreetbus 外掛程式用的是在 appspot.com 的舊伺服器。<br>新的伺服器"
+"在 schokokeks.org。<br>是否要切換至新的伺服器？（強烈建議）</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "是否切換至新的 openstreetbugs 伺服器？"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -9217,4 +9343,6 @@
 "upload this data. Maybe you have selected the wrong layer?"
 msgstr ""
+"<html>選取的資料包含來自 OpenStreetBugs 的資料。<br>您不能上傳這資料。您可能"
+"選擇了錯誤的圖層？"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -9223,28 +9351,28 @@
 #, java-format
 msgid "An error occurred: {0}"
-msgstr ""
+msgstr "發生一個錯誤：{0}"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
-msgstr ""
+msgstr "無法建立新的錯誤報告。結果：{0}"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
 msgid "Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
+msgstr "標頭包含許多數值而且不能對映為單一字串"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+msgid "Open OpenStreetBugs"
+msgstr "開啟 OpenStreetBugs"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-msgid "Open OpenStreetBugs"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+msgstr "開啟 OpenStreetBugs 視窗並使用自動下載"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
 "OpenStreetBugs"
-msgstr ""
+msgstr "可視區域可能太小或太大以致無法從 OpenStreetBugs 下載資料"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
@@ -9259,9 +9387,9 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
-msgstr ""
+msgstr "標記為完成"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
-msgstr ""
+msgstr "真的要結案嗎？"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
@@ -9270,46 +9398,48 @@
 "comment:</html>"
 msgstr ""
+"<html>確定將這個議題標記為「已解決」？<br><br>您也許可以加入額外的註解：</"
+"html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
-msgstr ""
+msgstr "新增議題"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
 msgid "Create issue"
-msgstr ""
+msgstr "建立議題"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
-msgstr ""
+msgstr "明確的描述此問題"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
 msgid "Please enter a user name"
-msgstr ""
+msgstr "請輸入使用者名稱"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
 msgid "Unknown issue state"
-msgstr ""
+msgstr "不明的議題狀態"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
 msgid "Open Visible..."
-msgstr ""
+msgstr "開啟可見的..."
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 msgid "Open only files that are visible in current view."
-msgstr ""
+msgstr "只開啟在目前的檢視中可見的檔案。"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57
 msgid "No view open - cannot determine boundaries!"
-msgstr ""
+msgstr "沒有開啟檢視 - 不能決定邊界！"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110
 #, java-format
 msgid "Unknown file extension: {0}"
-msgstr ""
+msgstr "不明的延伸檔名：{0}"
 
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:39
 msgid "Osmarender"
-msgstr ""
+msgstr "Osmarender"
 
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:94
@@ -9321,37 +9451,37 @@
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:125
 msgid "osmarender options"
-msgstr ""
+msgstr "osmarender 選項"
 
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:126
 msgid "Firefox executable"
-msgstr ""
+msgstr "Firefox 可執行檔"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24
 msgid "load data from API"
-msgstr ""
+msgstr "從 API 載入資料"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25
 msgid "change the selection"
-msgstr ""
+msgstr "改變選擇區域"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "change the viewport"
-msgstr ""
+msgstr "改變檢視連接埠"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "confirm all Remote Control actions manually"
-msgstr ""
+msgstr "手動確認所有的遠端控制動作"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr ""
+msgstr "允許 JOSM 被其他應用程式控制的外掛程式。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "Remote Control"
-msgstr ""
+msgstr "遠端控制"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "Settings for the Remote Control plugin."
-msgstr ""
+msgstr "遠端控制外掛程式的設定值。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
@@ -9361,31 +9491,33 @@
 "talking to the plugin."
 msgstr ""
+"遠端控制外掛程式會一直聽取本機的 8111 連接埠。此連接埠是無法改變的，因為它參"
+"照了外部應用程式與此外掛程式的溝通。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid "Permitted actions"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+msgstr "准許的動作"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+msgstr "遠端控制被要求自 API 下載資料。"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+msgstr "要求的詳細資料：{0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+msgstr "您是否要允許這個？"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
-msgstr ""
+msgstr "確認遠端控制動作"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211
 msgid "Remote Control has been asked to import data from the following URL:"
-msgstr ""
+msgstr "遠端控制被要求自下列 URL 匯入資料："
 
 #. Add menu
@@ -9399,69 +9531,69 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 msgid "Routing"
-msgstr ""
+msgstr "路線規畫"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 msgid "Click to add destination."
-msgstr ""
+msgstr "按這裡加入目的地。"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 msgid "Click and drag to move destination"
-msgstr ""
+msgstr "點選並拖曳移動至目的端"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 msgid "Click to remove destination"
-msgstr ""
+msgstr "按這裡刪除目的地。"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr ""
+msgstr "開啟路線規畫節點的清單"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
 msgid "Add routing layer"
-msgstr ""
+msgstr "加入路線規畫圖層"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
 msgid "Criteria"
-msgstr ""
+msgstr "條件"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Shortest"
-msgstr ""
+msgstr "最短"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
 msgid "Fastest"
-msgstr ""
+msgstr "最快"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
 msgid "Reverse route"
-msgstr ""
+msgstr "反轉路線"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
 msgid "Clear route"
-msgstr ""
+msgstr "清除路線"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
 msgid "Routing Plugin Preferences"
-msgstr ""
+msgstr "路線規畫外掛程式偏好設定"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
 msgid "Configure routing preferences."
-msgstr ""
+msgstr "設定路線規畫偏好設定"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
 msgid "Highway type"
-msgstr ""
+msgstr "公路類型"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Speed (Km/h)"
-msgstr ""
+msgstr "速限 (Km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
 msgid "Weight"
-msgstr ""
+msgstr "重量限制"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
+msgstr "輸入重量限制值"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69
@@ -9471,46 +9603,45 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75
 msgid "Load Tile"
-msgstr ""
+msgstr "載入拼貼"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86
 msgid "Show Tile Status"
-msgstr ""
+msgstr "載入拼貼狀態"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97
 msgid "Request Update"
-msgstr ""
+msgstr "要求更新"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108
 msgid "Load All Tiles"
-msgstr ""
+msgstr "載入所有拼貼"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118
 msgid "Increase zoom"
-msgstr ""
+msgstr "增加縮放"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127
 msgid "Decrease zoom"
-msgstr ""
+msgstr "減少縮放"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Flush Tile Cache"
-msgstr ""
+msgstr "清除拼貼快取"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
 msgid "image not loaded"
-msgstr ""
+msgstr "尚未載入圖片"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "正在上傳..."
+msgstr "正在載入圖片..."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
 msgid "autozoom"
-msgstr ""
+msgstr "自動縮放"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
 msgid "autoload tiles"
-msgstr ""
+msgstr "自動載入拼貼"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
@@ -9521,47 +9652,47 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "Settings for the SlippyMap plugin."
-msgstr ""
+msgstr "快速地圖外掛程式的設定值。"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
-msgstr ""
+msgstr "拼貼來源"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
-msgstr ""
+msgstr "自動縮放： "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
-msgstr ""
+msgstr "自動載入拼貼： "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
-msgstr ""
+msgstr "最大縮放等級： "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
-msgstr ""
+msgstr "淡化背景： "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123
 msgid "error loading metadata"
-msgstr ""
+msgstr "載入中繼資料時發生錯誤"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138
 #, java-format
 msgid "requested: {0}"
-msgstr ""
+msgstr "要求的：{0}"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142
 msgid "error requesting update"
-msgstr ""
+msgstr "要求更新時發生錯誤"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
-msgstr ""
+msgstr "自動儲存即時資料"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 msgid "Save captured data to file every minute."
-msgstr ""
+msgstr "每分鐘把取得的資料儲存為檔案。"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
@@ -9569,5 +9700,5 @@
 #, java-format
 msgid "Error while exporting {0}: {1}"
-msgstr ""
+msgstr "匯出 {0} 時發生錯誤：{1}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
@@ -9578,28 +9709,28 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-msgstr ""
+msgstr "按鈕「{0}」有重複的熱鍵 - 按鈕會被忽略！"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
-msgstr ""
+msgstr "SurveyorPlugin 需要 LiveGpsPlugin，但是找不到它！"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr ""
+msgstr "測量員..."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
-msgstr ""
+msgstr "開啟測量員工具。"
 
 #. surveyorFrame.setTitle((String)getValue(AbstractAction.NAME));
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
-msgstr ""
+msgstr "測量員"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
-msgstr ""
+msgstr "無法讀取測量員定義：{0}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
@@ -9607,17 +9738,17 @@
 #, java-format
 msgid "Error parsing {0}: {1}"
-msgstr ""
+msgstr "分析 {0} 時發生錯誤：{1}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
 msgid "start"
-msgstr ""
+msgstr "開始"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
 msgid "end"
-msgstr ""
+msgstr "結束"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
 msgid "Edit tags"
-msgstr ""
+msgstr "編輯標籤"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -9625,5 +9756,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "啟動標籤編輯器對話盒"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
@@ -9633,5 +9764,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
 msgid "Highlight"
-msgstr ""
+msgstr "突顯"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -9643,6 +9774,5 @@
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "移除 {0} 個物件之多的舊設定鍵"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
@@ -9650,6 +9780,5 @@
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "更新 {0} 個物件之多的屬性"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -9664,5 +9793,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
 msgid "Filter"
-msgstr ""
+msgstr "過濾條件"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -9675,5 +9804,5 @@
 #, java-format
 msgid "unexpected column number {0}"
-msgstr ""
+msgstr "未預期的欄號 {0}"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -9681,56 +9810,47 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
 msgid "Tagging Preset Tester"
-msgstr ""
+msgstr "標籤預設組合測試程式"
 
 #: ../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."
-msgstr ""
+msgstr "開啟標籤預設組合測試工具以預覽標籤預設組合對話盒。"
 
 #: ../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 ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr ""
+msgstr "您必須先在偏好設定中指定標籤預設組合來源。"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
 msgid "Reverse a terrace"
-msgstr ""
+msgstr "反轉一排連棟建築"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverses house numbers on a terrace."
-msgstr ""
+msgstr "反轉在連棟建築中房屋的編號。"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverse a Terrace"
-msgstr ""
+msgstr "反轉一排連棟建築"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113
 msgid "Reverse Terrace"
-msgstr ""
+msgstr "反轉連棟建築"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:68
 #: ../plugins/terracer/src/terracer/TerracerAction.java:72
 msgid "Terrace a building"
-msgstr ""
+msgstr "將建築連棟"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:70
 msgid "Creates individual buildings from a long building."
-msgstr ""
+msgstr "從一長排建築中建立個別建築。"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:130
 msgid "Select a single, closed way of at least four nodes."
-msgstr ""
+msgstr "選擇至少有四個節點的單一、封閉的路徑。"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:199
 msgid "Terrace"
-msgstr ""
+msgstr "連棟建築"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
@@ -9745,13 +9865,13 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
-msgstr ""
+msgstr "最高編號"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:473
 msgid "Lowest number"
-msgstr ""
+msgstr "最低編號"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:474
 msgid "Interpolation"
-msgstr ""
+msgstr "插入補間"
 
 #. item "Buildings/Addresses" text "House name"
@@ -9759,5 +9879,5 @@
 #: build/trans_presets.java:2173
 msgid "Street name"
-msgstr ""
+msgstr "街道名稱"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
@@ -9772,58 +9892,58 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
 msgid "Show Author Panel"
-msgstr ""
+msgstr "顯示作者面板"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98
 msgid "Open User Page"
-msgstr ""
+msgstr "開啟使用者頁面"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99
 msgid "Open User Page in browser"
-msgstr ""
+msgstr "在瀏覽器中開啟使用者頁面"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112
 msgid "Select User's Data"
-msgstr ""
+msgstr "選擇使用者的資料"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113
 msgid "Replaces Selection with Users data"
-msgstr ""
+msgstr "以使用者資料取代選擇區域"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148
 msgid "Please select some data"
-msgstr ""
+msgstr "請選取一些資料"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152
 msgid "Please choose a user using the author panel"
-msgstr ""
+msgstr "請使用作者面板選擇一個使用者"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165
 msgid "Sorry, doesn't work with anonymous users"
-msgstr ""
+msgstr "抱歉，不能用於匿名使用者"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
 msgid "Join overlapping Areas"
-msgstr ""
+msgstr "連結重疊的區域"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
 msgid "Joins areas that overlap each other"
-msgstr ""
+msgstr "連接彼此互相重疊的區域"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-msgstr ""
+msgstr "這 是 實 驗 性 的。請儲存您的工作並在上傳前檢驗。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 msgid "Continue anyway"
-msgstr ""
+msgstr "強制繼續"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133
 msgid "Only up to two areas can be joined at the moment."
-msgstr ""
+msgstr "目前只能連結兩個區域。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:138
 #, java-format
 msgid "\"{0}\" is not closed and therefore can't be joined."
-msgstr ""
+msgstr "「{0}」尚未封閉因此不能連結。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155
@@ -9834,37 +9954,40 @@
 "Are you really sure to continue?"
 msgstr ""
+"選取的路徑有在已下載資料區域之外的節點。\n"
+"這樣可能會造成意外刪除某些節點。\n"
+"確定要繼續嗎？"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
 msgid "Please abort if you are not sure"
-msgstr ""
+msgstr "如果不確定請放棄"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
 msgid "Please select at least one closed way the should be joined."
-msgstr ""
+msgstr "請選擇至少一個應該連結的封閉路徑。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
 msgid "No intersection found. Nothing was changed."
-msgstr ""
+msgstr "找不到交叉點。沒有東西變更。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "在所有的交叉點加入節點"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
+msgstr "刪除不屬於內部多邊形一部分的路徑"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Fix relations"
-msgstr ""
+msgstr "修正關係"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid "Joined self-overlapping area"
-msgstr ""
+msgstr "已連結自我重疊的區域"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
 msgid "Joined overlapping areas"
-msgstr ""
+msgstr "已連結重疊的區域"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
@@ -9872,81 +9995,81 @@
 "Some of the ways were part of relations that have been modified. Please "
 "verify no errors have been introduced."
-msgstr ""
+msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
 msgid "Fix tag conflicts"
-msgstr ""
+msgstr "修正標籤的衝突"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464
 msgid "Removed Element from Relations"
-msgstr ""
+msgstr "從關係中移除元件"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "連結區域：移除短路徑"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Closed Way"
-msgstr ""
+msgstr "封閉的路徑"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856
 msgid "Remove tags from inner ways"
-msgstr ""
+msgstr "移除內部路徑的標籤"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885
 msgid "Join Areas Function"
-msgstr ""
+msgstr "連結區域功能"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 msgid "Jump To Position"
-msgstr ""
+msgstr "跳至位置"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 msgid "Opens a dialog that allows to jump to a specific location"
-msgstr ""
+msgstr "開啟能跳到指定位置的對話盒"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
+msgid "Enter Lat/Lon to jump to position."
+msgstr "輸入要跳至地點的經/緯。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
-msgid "Enter Lat/Lon to jump to position."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+msgstr "您也可以貼上 www.openstreetmap.org 的 URL"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+msgstr "縮放（以公尺計）"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+msgstr "跳至那裡"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+msgstr "跳至位置"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+msgstr "無法貼上緯度、經度或縮放。請檢查。"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
-msgstr ""
+msgstr "無法分析經/緯"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Simplify Way"
-msgstr ""
+msgstr "簡化路徑"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Delete unnecessary nodes from a way."
-msgstr ""
+msgstr "刪除路徑不需要的節點。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82
 msgid "Please select at least one way to simplify."
-msgstr ""
+msgstr "請選擇至少一條路徑來簡化。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87
@@ -9955,10 +10078,9 @@
 msgid_plural ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "選擇區域包含 {0} 條路徑。確定要全部簡化？"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
 msgid "Are you sure?"
-msgstr ""
+msgstr "您確定嗎？"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35
@@ -9967,13 +10089,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 msgid "Validation errors"
-msgstr ""
+msgstr "驗證的錯誤"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:89
 msgid "No validation errors"
-msgstr ""
+msgstr "沒有驗證上的錯誤"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163
 msgid "Grid"
-msgstr ""
+msgstr "格線"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
@@ -9984,36 +10106,38 @@
 " {1}"
 msgstr ""
+"初始化測試 {0} 錯誤：\n"
+" {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
 msgid "Use ignore list."
-msgstr ""
+msgstr "使用忽略清單。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use the ignore list to suppress warnings."
-msgstr ""
+msgstr "使用忽略清單來抑制警告。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
 msgid "Use error layer."
-msgstr ""
+msgstr "使用錯誤圖層。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use the error layer to display problematic elements."
-msgstr ""
+msgstr "使用錯誤圖層來顯示有問題的元件。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
 msgid "Show informational level on upload."
-msgstr ""
+msgstr "上傳時顯示資訊層級。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show the informational tests in the upload check windows."
-msgstr ""
+msgstr "在上傳檢查視窗中顯示資訊測試。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
 msgid "On demand"
-msgstr ""
+msgstr "下指令時"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On upload"
-msgstr ""
+msgstr "上傳時"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
@@ -10021,9 +10145,9 @@
 "An OSM data validator that checks for common errors made by users and editor "
 "programs."
-msgstr ""
+msgstr "OSM 資料檢驗器，能夠檢查使用者與編輯器程式造成的一般性錯誤。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid "Data validator"
-msgstr ""
+msgstr "資料檢驗器"
 
 #. * Error messages
@@ -10034,5 +10158,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
 msgid "validation error"
-msgstr ""
+msgstr "驗證的錯誤"
 
 #. * Warning messages
@@ -10043,5 +10167,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
 msgid "validation warning"
-msgstr ""
+msgstr "驗證警告"
 
 #. * Other messages
@@ -10052,42 +10176,42 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17
 msgid "validation other"
-msgstr ""
+msgstr "驗證其他的"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
 msgid "Validation"
-msgstr ""
+msgstr "驗證"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
 msgid "Performs the data validation"
-msgstr ""
+msgstr "進行資料驗證"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
 msgid "Data with errors. Upload anyway?"
-msgstr ""
+msgstr "資料有錯誤。要強制上傳嗎？"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
 msgid "Open the validation window."
-msgstr ""
+msgstr "開啟驗證視窗。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80
 msgid "Zoom to problem"
-msgstr ""
+msgstr "縮放至問題點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
 msgid "Validate"
-msgstr ""
+msgstr "檢驗"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101
 msgid "Validate either current selection or complete dataset."
-msgstr ""
+msgstr "檢驗目前的選擇區域或整個資料組合。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
 msgid "Fix"
-msgstr ""
+msgstr "修正"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
 msgid "Fix the selected errors."
-msgstr ""
+msgstr "修正選取的錯誤。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
@@ -10097,25 +10221,25 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:107
 msgid "Ignore the selected errors next time."
-msgstr ""
+msgstr "下次忽略選取的錯誤。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
 msgid "Whole group"
-msgstr ""
+msgstr "整個群組"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
 msgid "Single elements"
-msgstr ""
+msgstr "單一元件"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
 msgid "Nothing"
-msgstr ""
+msgstr "不做任何事"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193
 msgid "Ignore whole group or individual elements?"
-msgstr ""
+msgstr "忽略整個群組或是個別元件？"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194
 msgid "Ignoring elements"
-msgstr ""
+msgstr "正在略過元件"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:67
@@ -10126,17 +10250,17 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
 msgid "Coastlines."
-msgstr ""
+msgstr "海岸線。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "This test checks that coastlines are correct."
-msgstr ""
+msgstr "這會測試海岸線是否正確。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
 msgid "Unordered coastline"
-msgstr ""
+msgstr "未排序的海岸線"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
 msgid "Crossing ways."
-msgstr ""
+msgstr "路徑交叉。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -10144,43 +10268,43 @@
 "This test checks if two roads, railways or waterways crosses in the same "
 "layer, but are not connected by a node."
-msgstr ""
+msgstr "這會測試是否有兩條道路、鐵路或水路在同一圖層交錯，卻沒有以節點連接。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:116
 msgid "Crossing ways"
-msgstr ""
+msgstr "路徑交叉"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
 msgid "Duplicated nodes"
-msgstr ""
+msgstr "重複的節點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
 msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
+msgstr "這會測試有沒有位置非常相近的節點存在。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
 msgid "Duplicated way nodes."
-msgstr ""
+msgstr "重複的路徑節點。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
 msgid "Checks for ways with identical consecutive nodes."
-msgstr ""
+msgstr "檢查是否有整個節點都相同的路徑。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
 msgid "Duplicated way nodes"
-msgstr ""
+msgstr "重複的路徑節點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
 msgid "Nodes with same name"
-msgstr ""
+msgstr "有同樣名稱的節點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
 msgid "This test finds nodes that have the same name (might be duplicates)."
-msgstr ""
+msgstr "這個測試會找出有相同名稱的節點（可能是重複的節點）。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
 msgid "Overlapping ways."
-msgstr ""
+msgstr "重疊的路徑。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
@@ -10188,73 +10312,73 @@
 "This test checks that a connection between two nodes is not used by more "
 "than one way."
-msgstr ""
+msgstr "這個測試會檢查兩個節點間的連結是否被用於一條以上的路徑。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
 msgid "Overlapping areas"
-msgstr ""
+msgstr "重疊的區域"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
 msgid "Overlapping highways (with area)"
-msgstr ""
+msgstr "重疊的公路（含區域）"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
 msgid "Overlapping railways (with area)"
-msgstr ""
+msgstr "重疊的鐵路（含區域）"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
 msgid "Overlapping ways (with area)"
-msgstr ""
+msgstr "重疊的路徑（含區域）"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
 msgid "Overlapping highways"
-msgstr ""
+msgstr "重疊的公路"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
 msgid "Overlapping railways"
-msgstr ""
+msgstr "重疊的鐵路"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
 msgid "Overlapping ways"
-msgstr ""
+msgstr "重疊的路徑"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:21
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:33
 msgid "Self-intersecting ways"
-msgstr ""
+msgstr "自我交叉的路徑"
 
 #: ../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 ""
+msgstr "這個測試會檢查路徑是否包含自己部分節點超過一次。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
 msgid "Similarly named ways"
-msgstr ""
+msgstr "名稱近似的路徑"
 
 #: ../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."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+msgstr "這個測試會檢查名稱近似的路徑，因為那有可能是拼錯字了。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+msgstr "屬性檢查器："
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+msgstr "這個外掛程式會檢查屬性中的設定鍵和數值有無錯誤。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+msgstr "無效的標籤檢查行- {0}： {1}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+msgstr "無效的拼字檢查行：{0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10262,211 +10386,225 @@
 "{0}"
 msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+"無法存取資料檔案：\n"
+"{0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
-msgstr ""
+msgstr "不合法的標籤/數值組合"
 
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+msgstr "繪圖問題"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+msgstr "設定鍵「{0}」無效。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+msgstr "標籤沒有數值"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+msgstr "無效的屬性設定鍵"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+msgstr "屬性設定鍵中有無效的空白字元"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+msgstr "屬性數值以空白字元開頭或結尾"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+msgstr "屬性數值含有 HTML 標記"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+msgstr "設定鍵「{0}」不在預設組合裡。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+msgstr "預設組合不包含屬性設定鍵"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+msgstr "設定鍵「{1}」的數值「{0}」不在預設組合中。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+msgstr "預設組合不包含屬性數值"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+msgstr "FIXMES"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+msgstr "檢查屬性設定鍵。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+msgstr "檢查文字清單以驗證屬性設定鍵是有效的。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+msgstr "使用複雜的屬性檢查器。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+msgstr "使用複雜的規則驗證屬性數值。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+msgstr "標籤檢查器來源"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+"拼字檢查或標籤檢查資料檔案的來源（URL 或檔案名稱）（請查閱 http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller）"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+msgstr "將新的來源加入清單。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+msgstr "編輯選取的來源。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+msgstr "資料來源"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+msgstr "檢查屬性數值。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+msgstr "驗證屬性數值合於預設組合的要求。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+msgstr "檢查 FIXMES。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
+msgstr "尋找在任何屬性數值中含有 FIXME 的節點或路徑。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+msgstr "檢查繪圖筆記。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+msgstr "檢查地圖繪製是否發現資料錯誤。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+msgstr "使用預設的資料檔案。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+msgstr "使用預設的資料檔案（建議值）。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "使用預設的資料檔案。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "使用預設的資料檔案（建議值）。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+msgstr "使用預設的拼字檢查檔案。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+msgstr "使用預設的拼字檢查檔案（建議值）。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+msgstr "修正屬性"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+msgstr "找不到元件類型"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+msgstr "找不到警告等級"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+msgstr "不合法的辭句「{0}」"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
-msgstr ""
+msgstr "不合法的正規表示式「{0}」"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
 msgid "Unclosed Ways."
-msgstr ""
+msgstr "未關閉的路徑。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
 msgid "This tests if ways which should be circular are closed."
-msgstr ""
+msgstr "這會測試圓形的路徑是否已封閉。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
 #, java-format
 msgid "natural type {0}"
-msgstr ""
+msgstr "自然的類型 {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "landuse type {0}"
-msgstr ""
+msgstr "土地利用的類型 {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "amenities type {0}"
-msgstr ""
+msgstr "便利設施類型 {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "sport type {0}"
-msgstr ""
+msgstr "運動設施類型 {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "tourism type {0}"
-msgstr ""
+msgstr "旅遊設施類型 {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "shop type {0}"
-msgstr ""
+msgstr "商店類型 {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "leisure type {0}"
-msgstr ""
+msgstr "空閒類型 {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "waterway type {0}"
-msgstr ""
+msgstr "水路類型 {0}"
 
 #. color place
@@ -10560,9 +10698,9 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
-msgstr ""
+msgstr "建築"
 
 #. color building
@@ -10574,7 +10712,7 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
-msgstr ""
+msgstr "區域"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
@@ -10582,80 +10720,85 @@
 msgstr "未封閉的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+msgstr "未連接的路徑。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+msgstr "這個測試會檢查路徑的結束點是否非常靠近其他的路徑。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+msgstr "路徑結束點靠近其他的公路"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+msgstr "路徑結束點靠近其他的路徑"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+msgstr "路徑節點靠近其他的路徑"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
-msgstr ""
+msgstr "已連接的路徑結束點靠近其他的路徑"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
 msgid "Untagged and unconnected nodes"
-msgstr ""
+msgstr "未加標籤與未連接的節點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr ""
+msgstr "這個測試會檢查未加標籤且不屬任何路徑的一部分的節點。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:56
 msgid "Untagged, empty and one node ways."
-msgstr ""
+msgstr "未加標籤、空的和僅一個節點的路徑。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:57
 msgid "This test checks for untagged, empty and one node ways."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+msgstr "這個測試會檢查未加標籤、空的和僅一個節點的路徑。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+msgstr "未命名的路徑"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "編輯交叉點"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+msgstr "未加標籤的路徑"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+msgstr "空的路徑"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
-msgstr ""
+msgstr "單一節點路徑"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
 msgid "Wrongly Ordered Ways."
-msgstr ""
+msgstr "排序錯誤的路徑。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "This test checks the direction of water, land and coastline ways."
-msgstr ""
+msgstr "這個測試會檢查水域、陸地和海岸線路徑的方向。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
 msgid "Reversed coastline: land not on left side"
-msgstr ""
+msgstr "反轉的海岸線：陸地不在左側"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
 msgid "Reversed water: land not on left side"
-msgstr ""
+msgstr "反轉的水域：陸地不在左側"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
 msgid "Reversed land: land not on left side"
-msgstr ""
+msgstr "反轉的陸地：陸地不在左側"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
@@ -10669,27 +10812,27 @@
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92
 msgid "Select a starting node on the end of a way"
-msgstr ""
-
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+msgstr "在路徑的結尾選擇開始的節點"
+
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
-msgstr ""
+msgstr "到達線條的結尾"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+msgstr "到達交會點"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
-msgstr ""
+msgstr "發生例外"
 
 #. super("Help / About");
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
 msgid "help"
-msgstr ""
+msgstr "求助"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
 msgid "Help / About"
-msgstr ""
+msgstr "求助 / 關於"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:27
@@ -10718,17 +10861,37 @@
 "use."
 msgstr ""
+"您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會在 "
+"WMS 選單中顯示出來。\n"
+"\n"
+"您也可以在進階偏好設定中手動完成它，使用下列配置：\n"
+"wmsplugin.url.1.name=Landsat\n"
+"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+"wmsplugin.url.2.name=NPE Maps... etc\n"
+"\n"
+"完整 WMS URL 輸入格式範例 (landsat)\n"
+"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+"\n"
+"以 Metacarta 的地圖修正器 http://labs.metacarta.com/rectifier/ 來說，您只需要"
+"輸入相對的「id」。\n"
+"要加入 Metacarta 地圖修正器選單項目，手動建立如這個範例的 URL，並將 73 換成您"
+"的圖片 id：\n"
+"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
+"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
+"\n"
+"注意：請確定圖片是合適的，沒有版權問題，如果有疑慮，請不要使用。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
 msgid "WMS Plugin Help"
-msgstr ""
+msgstr "WMS 外掛程式求助"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
 msgid "Rectified Image..."
-msgstr ""
+msgstr "修正的圖片..."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
 msgid "Download Rectified Images From Various Services"
-msgstr ""
+msgstr "從多種服務下載修正的圖片"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
@@ -10743,13 +10906,13 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
 msgid "Custom WMS Link"
-msgstr ""
+msgstr "自訂 WMS 連結"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
 msgid "Supported Rectifier Services:"
-msgstr ""
+msgstr "支援的修正器服務："
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
 msgid "Visit Homepage"
-msgstr ""
+msgstr "參觀首頁"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
@@ -10760,5 +10923,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Add Rectified Image"
-msgstr ""
+msgstr "加入修正的圖片"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
@@ -10766,15 +10929,15 @@
 "Couldn't match the entered link or id to the selected service. Please try "
 "again."
-msgstr ""
+msgstr "無法將整個連結或 id 與選取的服務進行比對。請再試一次。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
 msgid "No valid WMS URL or id"
-msgstr ""
+msgstr "沒有有效的 WMS URL 或 id"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
 msgid "Adjust the position of the selected WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+msgstr "調整選取的 WMS 圖層的位置"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10782,122 +10945,113 @@
 "This may lead to wrong coordinates."
 msgstr ""
+"URL 中的投影「{0}」與目前的投影「{1}」不符。\n"
+"這可能會導致錯誤的坐標。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58
 msgid "Automatic downloading"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+msgstr "自動下載"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+msgstr "WMS 圖層 ({0})，於縮放 {1} 自動下載"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+msgstr "WMS 圖層 ({0})，於縮放 {1} 下載"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+msgstr "要求的區域太大。請拉近一點，或是改變解析度"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+msgstr "下載可見的拼貼"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+msgstr "改變解析度"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+msgstr "重新載入錯誤的拼貼"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+msgstr "透明色版"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+msgstr "將 WMS 圖層儲存為檔案"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
-msgstr ""
+msgstr "儲存 WMS 圖層"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+msgid "Load WMS layer from file"
+msgstr "從檔案載入 WMS 圖層"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
-msgid "Load WMS layer from file"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
 msgid "Load WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+msgstr "載入 WMS 圖層"
+
+#: ../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:335
+msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+msgstr "檔案格式錯誤"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
-msgstr ""
+msgstr "開啓空白 WMS 圖層以便自檔案載入資料"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "WMS Plugin Preferences"
+msgstr "WMS 外掛程式偏好設定"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr "修改在 WMS 外掛程式選單中顯示的 WMS 伺服器清單"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "WMS Plugin Preferences"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
+msgid "Menu Name"
+msgstr "選單名稱"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
-msgid "Menu Name"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+msgid "WMS URL"
+msgstr "WMS URL"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "Menu Name (Default)"
+msgstr "選單名稱（預設值）"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+msgid "WMS URL (Default)"
+msgstr "WMS URL（預設值）"
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
-msgid "WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "Menu Name (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
-msgid "WMS URL (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Enter a menu name and WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+msgstr "輸入選單名稱和 WMS URL"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+msgstr "複製預設值"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "下載"
 
 #. *
@@ -10909,10 +11063,10 @@
 "You requested too many nodes (limit is 50,000). Either request a smaller "
 "area, or use planet.osm"
-msgstr ""
+msgstr "您要求太多節點（限制為 50,000）。請使用更小的區域，或改用 planet.osm"
 
 #. OSM server message
 #: build/specialmessages.java:7
 msgid "Database offline for maintenance"
-msgstr ""
+msgstr "資料庫離線維護中"
 
 #. OSM server message
@@ -10922,19 +11076,21 @@
 "request a smaller area, or use planet.osm"
 msgstr ""
+"最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet."
+"osm"
 
 #. OSM server message
 #: build/specialmessages.java:9
 msgid "could not get audio input stream from input URL"
-msgstr ""
+msgstr "無法從輸入的 URL 取得音效輸入串流"
 
 #. Java message loading audio data
 #: build/specialmessages.java:10
 msgid "Audio Device Unavailable"
-msgstr ""
+msgstr "音效裝置無法使用"
 
 #. Java message loading audio data
 #: build/specialmessages.java:11
 msgid "You must make your edits public to upload new data"
-msgstr ""
+msgstr "您必須將自己的編輯設為公開才能上傳新的資料"
 
 #. Plugin AgPifoJ
@@ -10944,9 +11100,11 @@
 "import EXIF geotagged pictures."
 msgstr ""
+"JOSM 的另一個 geotag 外掛程式。將相片與 GPS 軌跡關聯或匯入 EXIF 已有 geotag "
+"的相片。"
 
 #. Plugin cadastre-fr
 #: build/trans_plugins.java:5
 msgid "A special handler for the French land registry WMS server."
-msgstr ""
+msgstr "用於法國土地登記 WMS 伺服器的特別處理程式。"
 
 #. Plugin colorscheme
@@ -10959,9 +11117,12 @@
 "true :-)"
 msgstr ""
+"允許使用者建立不同的顏色配置並在它們之間切換。只要改變顏色並建立新的配置即"
+"可。可用來切換為白色背景以便在明亮的陽光下有較佳的視覺感受。請查閱 JOSM 偏好"
+"設定中的對話盒與「地圖設定值」 (有點怪但確是真的 :-)"
 
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
 msgid "Create a grid of ways."
-msgstr ""
+msgstr "建立路徑的格線。"
 
 #. Plugin czechaddress
@@ -10969,10 +11130,10 @@
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
-msgstr ""
+msgstr "建立並處理捷克共和國中的地址節點與建築。"
 
 #. Plugin dataimport
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "允許直接將多種檔案格式匯入 JOSM。"
 
 #. Plugin DirectUpload
@@ -10982,9 +11143,11 @@
 "openstreetmap.org."
 msgstr ""
+"這個外掛程式可以將 JOSM 中目前使用的圖層 GPS 軌跡直接上傳至 openstreetmap."
+"org。"
 
 #. Plugin Duplicate-Way
 #: build/trans_plugins.java:17
 msgid "Duplicate Ways with an offset"
-msgstr ""
+msgstr "重製路徑並位移"
 
 #. Plugin editgpx
@@ -10993,15 +11156,15 @@
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
-msgstr ""
+msgstr "允許使用者非常快速的隱藏時間戳記並刪除大量 GPX 軌跡的部分。"
 
 #. Plugin globalsat
 #: build/trans_plugins.java:21
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr ""
+msgstr "在 JOSM 中直接從 Globalsat dg100 資料記錄器下載 GPS 點。"
 
 #. Plugin grid
 #: build/trans_plugins.java:23
 msgid "Provide a background layer that displays a map grid"
-msgstr ""
+msgstr "提供顯示地圖格線的背景圖層"
 
 #. Plugin ImageWayPoint
@@ -11012,9 +11175,11 @@
 "the filename of an image."
 msgstr ""
+"另一個用來將圖片與 GPX 檔案中的航點配對的外掛程式。配對的方式是當航點標籤的"
+"「name」、「cmt」或「desc」屬性與圖片的檔案名稱相符時就是配對成功。"
 
 #. Plugin lakewalker
 #: build/trans_plugins.java:27
 msgid "Helps vectorizing WMS images."
-msgstr ""
+msgstr "協助將 WMS 圖片向量化。"
 
 #. Plugin livegps
@@ -11022,5 +11187,5 @@
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
-msgstr ""
+msgstr "支援透過連線到 gpsd 伺服器的即時 GPS 輸入（移動點）。"
 
 #. Plugin measurement
@@ -11031,4 +11196,6 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
+"提供測量對話盒與圖層以測量區段、由（簡單的）封閉路徑圍繞的區域的長度與角度，"
+"並建立測量路徑（也可以從 gps 圖層匯入）。"
 
 #. Plugin nearclick
@@ -11039,14 +11206,16 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
+"當您進行小且短暫的拖曳時模擬為點選動作。這對平板電腦的觸控筆很有用，當您有問"
+"題時只要點選面板而不需移動滑鼠（一般性 Java - 平板電腦問題）。"
 
 #. Plugin openlayers
 #: build/trans_plugins.java:35
 msgid "Displays an OpenLayers background image"
-msgstr ""
+msgstr "顯示 OpenLayers 背景圖片"
 
 #. Plugin openstreetbugs
 #: build/trans_plugins.java:37
 msgid "Imports issues from OpenStreetBugs"
-msgstr ""
+msgstr "匯入OpenStreetBugs 的議題"
 
 #. Plugin openvisible
@@ -11054,5 +11223,5 @@
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
-msgstr ""
+msgstr "允許開啟與目前可視螢幕區域交集的 gpx/osm 檔案"
 
 #. Plugin osmarender
@@ -11060,5 +11229,5 @@
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
-msgstr ""
+msgstr "執行 FireFox 將目前可見的畫面顯示為很好的 SVG 圖片。"
 
 #. Plugin PicLayer
@@ -11067,20 +11236,20 @@
 "This plugin allows to display any picture as a background in the editor and "
 "align it with the map."
-msgstr ""
+msgstr "這個外掛程式允許顯示任何圖片做為編輯器的背景並將它對齊地圖。"
 
 #. Plugin plastic_laf
 #: build/trans_plugins.java:45
 msgid "The great JGoodies Plastic Look and Feel."
-msgstr ""
+msgstr "超棒的 JGoodies 塑膠外觀與感覺。"
 
 #. Plugin remotecontrol
 #: build/trans_plugins.java:47
 msgid "Let other applications send commands to JOSM."
-msgstr ""
+msgstr "讓其他的應用程式傳送指令給 JOSM。"
 
 #. Plugin routing
 #: build/trans_plugins.java:49
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "提供路線規畫的功能。"
 
 #. Plugin slippymap
@@ -11090,14 +11259,15 @@
 "background and request updates."
 msgstr ""
+"在 JOSM 中顯示快速地圖格線。可以從快速地圖中載入拼貼作為背景並要求更新。"
 
 #. Plugin surveyor
 #: build/trans_plugins.java:53
 msgid "Allow adding markers/nodes on current gps positions."
-msgstr ""
+msgstr "允許在目前的 gps 位置加入標記/節點。"
 
 #. Plugin tageditor
 #: build/trans_plugins.java:55
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
+msgstr "提供在表格線中編輯標籤的對話盒。"
 
 #. Plugin tagging-preset-tester
@@ -11108,46 +11278,47 @@
 "the jar-file as standalone as well."
 msgstr ""
-
-#. Plugin tcx-support
+"在求助選單中加入標籤預設組合測試器，可以協助您進行標籤預設組合的開發（會彈出"
+"快速預覽對話盒）。您也可以單獨以 jar-檔案的方式啟動。"
+
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr ""
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr "讓連棟房屋能超出單一區塊。"
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
 "user, opens browser showing selected author profile page."
 msgstr ""
+"與作者/使用者相關的工具。選擇屬於選取的使用者的地圖資料，開啟瀏覽器顯示選取的"
+"作者個人資料頁面。"
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
 "jump to position."
-msgstr ""
+msgstr "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。"
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
 "for the common ones. Spellcheck integrated for tag names."
 msgstr ""
+"OSM 資料驗證器。它會檢查資料中的問題，並提供對一般問題的修正。同時整合了對標"
+"籤名稱的拼字檢查。"
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr "方便的下載一整組互相聯結的路徑"
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
-msgstr ""
+msgstr "顯示地理參照圖片作為 JOSM 的背景(WMS 伺服器、Yahoo...)。"
 
 #. <!--
@@ -11192,5 +11363,5 @@
 #: build/trans_presets.java:47
 msgid "Streets"
-msgstr ""
+msgstr "街道"
 
 #. group "Streets"
@@ -11201,5 +11372,5 @@
 #: build/trans_presets.java:48 build/trans_surveyor.java:72
 msgid "Motorway"
-msgstr ""
+msgstr "高速公路(Motorway)"
 
 #. item
@@ -11208,5 +11379,5 @@
 #: build/trans_presets.java:51
 msgid "Edit Motorway"
-msgstr ""
+msgstr "編輯高速公路"
 
 #. item "Streets/Motorway" label "Edit Motorway"
@@ -11236,5 +11407,5 @@
 #: build/trans_presets.java:1526 build/trans_presets.java:2996
 msgid "Reference"
-msgstr ""
+msgstr "道路編號"
 
 #. item "Streets/Motorway" text "Name"
@@ -11291,5 +11462,5 @@
 #: build/trans_presets.java:1062 build/trans_presets.java:1281
 msgid "Layer"
-msgstr ""
+msgstr "層級"
 
 #. item "Streets/Motorway" combo "Layer"
@@ -11306,5 +11477,5 @@
 #: build/trans_presets.java:171 build/trans_presets.java:347
 msgid "Lanes"
-msgstr ""
+msgstr "車道數"
 
 #. item "Streets/Motorway" combo "Lanes"
@@ -11332,5 +11503,5 @@
 #: build/trans_presets.java:1283
 msgid "Max. speed (km/h)"
-msgstr ""
+msgstr "最高限速 (km/h)"
 
 #. item "Streets/Motorway" text "Max. speed (km/h)"
@@ -11378,5 +11549,5 @@
 #: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Oneway"
-msgstr ""
+msgstr "單行道"
 
 #. item "Streets/Motorway" check "Oneway"
@@ -11432,5 +11603,5 @@
 #: build/trans_presets.java:1277 build/trans_surveyor.java:12
 msgid "Bridge"
-msgstr ""
+msgstr "橋"
 
 #. item "Streets/Motorway" check "Bridge"
@@ -11480,5 +11651,5 @@
 #: build/trans_presets.java:1278
 msgid "Tunnel"
-msgstr ""
+msgstr "隧道"
 
 #. item "Streets/Motorway" check "Tunnel"
@@ -11525,5 +11696,5 @@
 #: build/trans_presets.java:647 build/trans_presets.java:1279
 msgid "Cutting"
-msgstr ""
+msgstr "斷開"
 
 #. item "Streets/Motorway" check "Cutting"
@@ -11570,5 +11741,5 @@
 #: build/trans_presets.java:648 build/trans_presets.java:1280
 msgid "Embankment"
-msgstr ""
+msgstr "堤防"
 
 #. item "Streets/Motorway" check "Embankment"
@@ -11576,5 +11747,5 @@
 #: build/trans_presets.java:67
 msgid "Motorway Link"
-msgstr ""
+msgstr "高速公路連絡道路"
 
 #. item
@@ -11583,5 +11754,5 @@
 #: build/trans_presets.java:70
 msgid "Edit Motorway Link"
-msgstr ""
+msgstr "編輯高速公路連絡道路"
 
 #. item "Streets/Motorway Link" check "Embankment"
@@ -11589,5 +11760,5 @@
 #: build/trans_presets.java:84
 msgid "Trunk"
-msgstr ""
+msgstr "快速道路(Trunk)"
 
 #. item
@@ -11596,5 +11767,5 @@
 #: build/trans_presets.java:87
 msgid "Edit Trunk"
-msgstr ""
+msgstr "編輯快速道路"
 
 #. item "Streets/Trunk" check "Oneway"
@@ -11605,5 +11776,5 @@
 #: build/trans_presets.java:137 build/trans_presets.java:153
 msgid "Motorroad"
-msgstr ""
+msgstr "汽車專用"
 
 #. item "Streets/Trunk" check "Embankment"
@@ -11611,5 +11782,5 @@
 #: build/trans_presets.java:104
 msgid "Trunk Link"
-msgstr ""
+msgstr "快速道路連絡道路"
 
 #. item
@@ -11618,5 +11789,5 @@
 #: build/trans_presets.java:107
 msgid "Edit Trunk Link"
-msgstr ""
+msgstr "編輯快速道路連絡道路"
 
 #. item "Streets/Trunk Link" check "Embankment"
@@ -11629,5 +11800,5 @@
 #: build/trans_presets.java:124 build/trans_surveyor.java:76
 msgid "Primary"
-msgstr ""
+msgstr "省道(Primary)"
 
 #. item
@@ -11636,5 +11807,5 @@
 #: build/trans_presets.java:127
 msgid "Edit Primary Road"
-msgstr ""
+msgstr "編輯省道"
 
 #. item "Streets/Primary" check "Embankment"
@@ -11642,10 +11813,10 @@
 #: build/trans_presets.java:144
 msgid "Primary Link"
-msgstr ""
+msgstr "省道連絡道路"
 
 #. item
 #: build/trans_presets.java:145
 msgid "Edit Primary Link"
-msgstr ""
+msgstr "編輯省道連絡道路"
 
 #. item "Streets/Primary Link" check "Embankment"
@@ -11657,5 +11828,5 @@
 #: build/trans_presets.java:160 build/trans_surveyor.java:80
 msgid "Secondary"
-msgstr ""
+msgstr "縣道(Secondary)"
 
 #. item
@@ -11665,5 +11836,5 @@
 #: build/trans_presets.java:164
 msgid "Edit Secondary Road"
-msgstr ""
+msgstr "編輯縣道"
 
 #. item "Streets/Secondary" check "Embankment"
@@ -11671,5 +11842,5 @@
 #: build/trans_presets.java:180
 msgid "Tertiary"
-msgstr ""
+msgstr "鄉道(Tertiary)"
 
 #. item
@@ -11679,5 +11850,5 @@
 #: build/trans_presets.java:184
 msgid "Edit Tertiary Road"
-msgstr ""
+msgstr "編輯鄉道"
 
 #. item "Streets/Tertiary" check "Embankment"
@@ -11689,5 +11860,5 @@
 #: build/trans_presets.java:199 build/trans_surveyor.java:84
 msgid "Unclassified"
-msgstr ""
+msgstr "未分類(Unclassified)"
 
 #. item
@@ -11697,5 +11868,5 @@
 #: build/trans_presets.java:203
 msgid "Edit Unclassified Road"
-msgstr ""
+msgstr "編輯未分類的道路"
 
 #. item "Streets/Unclassified" text "Max. speed (km/h)"
@@ -11736,5 +11907,5 @@
 #: build/trans_presets.java:1467 build/trans_presets.java:1509
 msgid "Width (meters)"
-msgstr ""
+msgstr "寬度 (米)"
 
 #. item "Streets/Unclassified" text "Width (meters)"
@@ -11746,5 +11917,5 @@
 #: build/trans_presets.java:218 build/trans_surveyor.java:88
 msgid "Residential"
-msgstr ""
+msgstr "居住的(Residential)"
 
 #. item
@@ -11753,5 +11924,5 @@
 #: build/trans_presets.java:221
 msgid "Edit Residential Street"
-msgstr ""
+msgstr "編輯居住的街道"
 
 #. item "Streets/Residential" combo "Layer"
@@ -11783,5 +11954,5 @@
 #: build/trans_presets.java:650 build/trans_presets.java:1282
 msgid "Surface"
-msgstr ""
+msgstr "路面"
 
 #. item "Streets/Residential" combo "Surface"
@@ -11807,5 +11978,5 @@
 #: build/trans_presets.java:650 build/trans_presets.java:1282
 msgid "paved"
-msgstr ""
+msgstr "有鋪面的"
 
 #: build/trans_presets.java:232 build/trans_presets.java:250
@@ -11816,5 +11987,5 @@
 #: build/trans_presets.java:650 build/trans_presets.java:1282
 msgid "unpaved"
-msgstr ""
+msgstr "沒鋪面的"
 
 #. item "Ways/Track Grade 2" combo "Surface"
@@ -11829,5 +12000,5 @@
 #: build/trans_presets.java:650 build/trans_presets.java:1282
 msgid "cobblestone"
-msgstr ""
+msgstr "石子路"
 
 #. item "Streets/Residential" text "Width (meters)"
@@ -11835,5 +12006,5 @@
 #: build/trans_presets.java:236
 msgid "Living Street"
-msgstr ""
+msgstr "生活街道"
 
 #. item
@@ -11842,5 +12013,5 @@
 #: build/trans_presets.java:239
 msgid "Edit Living Street"
-msgstr ""
+msgstr "編輯生活街道"
 
 #. item "Streets/Living Street" text "Width (meters)"
@@ -11848,5 +12019,5 @@
 #: build/trans_presets.java:254
 msgid "Service"
-msgstr ""
+msgstr "巷/弄(Service)"
 
 #. item
@@ -11855,5 +12026,5 @@
 #: build/trans_presets.java:257
 msgid "Edit Serviceway"
-msgstr ""
+msgstr "編輯巷/弄"
 
 #. item "Streets/Service" label "Edit Serviceway"
@@ -11863,18 +12034,18 @@
 #: build/trans_presets.java:261
 msgid "Serviceway type"
-msgstr ""
+msgstr "巷/弄道路類型"
 
 #. item "Streets/Service" combo "Serviceway type"
 #: build/trans_presets.java:261
 msgid "alley"
-msgstr ""
+msgstr "巷/弄"
 
 #: build/trans_presets.java:261
 msgid "driveway"
-msgstr ""
+msgstr "車道"
 
 #: build/trans_presets.java:261
 msgid "parking_aisle"
-msgstr ""
+msgstr "停車場通道"
 
 #. item "Streets/Service" text "Width (meters)"
@@ -11882,5 +12053,5 @@
 #: build/trans_presets.java:274
 msgid "Parking Aisle"
-msgstr ""
+msgstr "停車場通道"
 
 #. item
@@ -11890,5 +12061,5 @@
 #: build/trans_presets.java:278
 msgid "Edit Parking Aisle"
-msgstr ""
+msgstr "編輯停車場通道"
 
 #. </optional>
@@ -11896,5 +12067,5 @@
 #: build/trans_presets.java:288
 msgid "Road (Unknown Type)"
-msgstr ""
+msgstr "道路（不明的類型）"
 
 #. item
@@ -11903,5 +12074,5 @@
 #: build/trans_presets.java:291
 msgid "Edit Road of unknown type"
-msgstr ""
+msgstr "編輯不明類型的道路"
 
 #. item "Streets/Road (Unknown Type)" text "Width (meters)"
@@ -11910,20 +12081,20 @@
 #: build/trans_presets.java:307
 msgid "Road Restrictions"
-msgstr ""
+msgstr "道路限制"
 
 #. item
 #: build/trans_presets.java:308
 msgid "Edit Road Restrictions"
-msgstr ""
+msgstr "編輯道路限制"
 
 #. item "Streets/Road Restrictions" check "Oneway"
 #: build/trans_presets.java:310
 msgid "Toll"
-msgstr ""
+msgstr "通行費"
 
 #. item "Streets/Road Restrictions" check "Toll"
 #: build/trans_presets.java:311
 msgid "No exit (cul-de-sac)"
-msgstr ""
+msgstr "沒有出口（死路）"
 
 #. item "Streets/Road Restrictions" check "No exit (cul-de-sac)"
@@ -11940,4 +12111,64 @@
 msgid "Access"
 msgstr ""
+
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Track Grade 1" combo "Access"
+#. item "Ways/Track Grade 1" combo "Motorcycle"
+#. item "Ways/Track Grade 1" combo "Motorcar"
+#. item "Ways/Track Grade 2" combo "Access"
+#. item "Ways/Track Grade 2" combo "Motorcycle"
+#. item "Ways/Track Grade 2" combo "Motorcar"
+#. item "Ways/Track Grade 3" combo "Access"
+#. item "Ways/Track Grade 3" combo "Motorcycle"
+#. item "Ways/Track Grade 3" combo "Motorcar"
+#. item "Ways/Track Grade 4" combo "Access"
+#. item "Ways/Track Grade 4" combo "Motorcycle"
+#. item "Ways/Track Grade 4" combo "Motorcar"
+#. item "Ways/Track Grade 5" combo "Access"
+#. item "Ways/Track Grade 5" combo "Motorcycle"
+#. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "是"
 
 #. color permissive
@@ -11962,7 +12193,7 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
-msgstr ""
+msgstr "私人的"
 
 #: build/trans_presets.java:312 build/trans_presets.java:313
@@ -11985,5 +12216,5 @@
 #: build/trans_presets.java:641
 msgid "designated"
-msgstr ""
+msgstr "已指定"
 
 #. color private
@@ -12008,7 +12239,7 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
-msgstr ""
+msgstr "目的地"
 
 #. color deprecated
@@ -12043,5 +12274,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
 msgstr ""
@@ -12059,13 +12290,37 @@
 #: build/trans_presets.java:623
 msgid "agricultural"
-msgstr ""
+msgstr "農業的"
+
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "否"
 
 #: build/trans_presets.java:315
 msgid "Goods"
-msgstr ""
+msgstr "貨物"
 
 #: build/trans_presets.java:316
 msgid "Heavy Goods Vehicles (hgv)"
-msgstr ""
+msgstr "大型車 (hgv)"
 
 #. item "Barriers/Bollard" check "Bicycle"
@@ -12085,5 +12340,5 @@
 #: build/trans_presets.java:1015
 msgid "Horse"
-msgstr ""
+msgstr "馬"
 
 #. item "Barriers/Bollard" check "Horse"
@@ -12107,5 +12362,5 @@
 #: build/trans_presets.java:1016
 msgid "Motorcycle"
-msgstr ""
+msgstr "機車"
 
 #. item "Ways/Path" label "Type"
@@ -12129,22 +12384,22 @@
 #: build/trans_presets.java:1017
 msgid "Motorcar"
-msgstr ""
+msgstr "汽車"
 
 #: build/trans_presets.java:320
 msgid "Public Service Vehicles (psv)"
-msgstr ""
+msgstr "公共汽車 (psv)"
 
 #: build/trans_presets.java:321
 msgid "Motorboat"
-msgstr ""
+msgstr "動力小船"
 
 #: build/trans_presets.java:322
 msgid "Boat"
-msgstr ""
+msgstr "小船"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
 #: build/trans_presets.java:324
 msgid "Min. speed (km/h)"
-msgstr ""
+msgstr "最低限速 (km/h)"
 
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
@@ -12152,25 +12407,25 @@
 #: build/trans_presets.java:325 build/trans_presets.java:363
 msgid "Max. weight (tonnes)"
-msgstr ""
+msgstr "總重限制（噸）"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
 #: build/trans_presets.java:326
 msgid "Max. Height (meters)"
-msgstr ""
+msgstr "高度限制（米）"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
 #: build/trans_presets.java:327
 msgid "Max. Width (meters)"
-msgstr ""
+msgstr "寬度限制（米）"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
 #: build/trans_presets.java:328
 msgid "Max. Length (meters)"
-msgstr ""
+msgstr "長度限制（米）"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
 #: build/trans_presets.java:330
 msgid "Roundabout"
-msgstr ""
+msgstr "圓環"
 
 #. item
@@ -12181,5 +12436,5 @@
 #: build/trans_presets.java:335
 msgid "Edit Junction"
-msgstr ""
+msgstr "編輯交叉點"
 
 #. item "Streets/Roundabout" label "Edit Junction"
@@ -12205,5 +12460,5 @@
 #: build/trans_presets.java:2770
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #. item "Streets/Roundabout" combo "Type"
@@ -12273,12 +12528,12 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
-msgstr ""
+msgstr "高速公路"
 
 #: build/trans_presets.java:338
 msgid "motorway_link"
-msgstr ""
+msgstr "高速公路連絡道路"
 
 #. color motorway
@@ -12298,12 +12553,12 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
-msgstr ""
+msgstr "快速道路"
 
 #: build/trans_presets.java:338
 msgid "trunk_link"
-msgstr ""
+msgstr "快速道路連絡道路"
 
 #. color trunk
@@ -12323,12 +12578,12 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
-msgstr ""
+msgstr "省道"
 
 #: build/trans_presets.java:338
 msgid "primary_link"
-msgstr ""
+msgstr "省道連絡道路"
 
 #. color primary
@@ -12348,8 +12603,8 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
-msgstr ""
+msgstr "縣道"
 
 #. color secondary
@@ -12361,11 +12616,11 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
-msgstr ""
+msgstr "鄉道"
 
 #: build/trans_presets.java:338
 msgid "unclassified"
-msgstr ""
+msgstr "未分類的"
 
 #. color green
@@ -12377,11 +12632,11 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
-msgstr ""
+msgstr "居住的"
 
 #: build/trans_presets.java:338
 msgid "living_street"
-msgstr ""
+msgstr "生活街道"
 
 #. color street
@@ -12393,11 +12648,28 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
-msgstr ""
+msgstr "巷/弄"
 
 #: build/trans_presets.java:338
 msgid "bus_guideway"
-msgstr ""
+msgstr "公車專用道"
 
 #. color turningcircle
@@ -12418,8 +12690,8 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
-msgstr ""
+msgstr "施工"
 
 #. item
@@ -12430,10 +12702,10 @@
 #: build/trans_presets.java:356
 msgid "Edit Bridge"
-msgstr ""
+msgstr "編輯橋樑"
 
 #. item
 #: build/trans_presets.java:368
 msgid "Edit Tunnel"
-msgstr ""
+msgstr "編輯隧道"
 
 #. item "Streets/Tunnel" text "Width (meters)"
@@ -12441,19 +12713,19 @@
 #: build/trans_presets.java:382
 msgid "Ways"
-msgstr ""
+msgstr "路徑"
 
 #. group "Ways"
 #: build/trans_presets.java:383
 msgid "Construction"
-msgstr ""
+msgstr "施工"
 
 #. item
 #: build/trans_presets.java:384
 msgid "Edit Highway Under Construction"
-msgstr ""
+msgstr "編輯施工中的公路"
 
 #: build/trans_presets.java:400
 msgid "Junction"
-msgstr ""
+msgstr "交叉點"
 
 #. item "Ways/Construction" combo "Junction"
@@ -12467,7 +12739,7 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
-msgstr ""
+msgstr "圓環"
 
 #. item "Ways/Construction" text "Width (meters)"
@@ -12476,5 +12748,5 @@
 #: build/trans_presets.java:406
 msgid "Bridleway"
-msgstr ""
+msgstr "馬道"
 
 #. item
@@ -12482,5 +12754,5 @@
 #: build/trans_presets.java:408
 msgid "Edit Bridleway"
-msgstr ""
+msgstr "編輯馬道"
 
 #. item "Ways/Bridleway" text "Width (meters)"
@@ -12488,5 +12760,5 @@
 #: build/trans_presets.java:424
 msgid "Cycleway"
-msgstr ""
+msgstr "自行車道"
 
 #. item
@@ -12496,5 +12768,5 @@
 #: build/trans_presets.java:428
 msgid "Edit Cycleway"
-msgstr ""
+msgstr "編輯自行車道"
 
 #. item "Ways/Cycleway" text "Width (meters)"
@@ -12502,5 +12774,5 @@
 #: build/trans_presets.java:444
 msgid "Footway"
-msgstr ""
+msgstr "人行步道"
 
 #. item
@@ -12509,5 +12781,5 @@
 #: build/trans_presets.java:447
 msgid "Edit Footway"
-msgstr ""
+msgstr "編輯人行步道"
 
 #. item "Ways/Footway" text "Width (meters)"
@@ -12515,5 +12787,5 @@
 #: build/trans_presets.java:463
 msgid "Pedestrian"
-msgstr ""
+msgstr "徒步區"
 
 #. item
@@ -12522,5 +12794,5 @@
 #: build/trans_presets.java:466
 msgid "Edit Pedestrian Street"
-msgstr ""
+msgstr "編輯徒步區街道"
 
 #. item "Ways/Pedestrian" text "Width (meters)"
@@ -12528,5 +12800,5 @@
 #: build/trans_presets.java:481
 msgid "Steps"
-msgstr ""
+msgstr "階梯"
 
 #. item
@@ -12536,5 +12808,5 @@
 #: build/trans_presets.java:485
 msgid "Edit Flight of Steps"
-msgstr ""
+msgstr "編輯階梯"
 
 #. item "Ways/Steps" text "Width (meters)"
@@ -12543,5 +12815,5 @@
 #: build/trans_presets.java:502
 msgid "Track"
-msgstr ""
+msgstr "產業道路"
 
 #. item
@@ -12550,14 +12822,14 @@
 #: build/trans_presets.java:505
 msgid "Edit Track"
-msgstr ""
+msgstr "編輯產業道路"
 
 #: build/trans_presets.java:514 build/trans_presets.java:535
 msgid "concrete"
-msgstr ""
+msgstr "水泥地"
 
 #: build/trans_presets.java:514 build/trans_presets.java:556
 #: build/trans_presets.java:577
 msgid "gravel"
-msgstr ""
+msgstr "碎石路"
 
 #. item "Ways/Track Grade 4" combo "Surface"
@@ -12567,10 +12839,10 @@
 #: build/trans_presets.java:619
 msgid "ground"
-msgstr ""
+msgstr "地面"
 
 #: build/trans_presets.java:514 build/trans_presets.java:598
 #: build/trans_presets.java:619
 msgid "grass"
-msgstr ""
+msgstr "草地"
 
 #: build/trans_presets.java:514 build/trans_presets.java:556
@@ -12578,5 +12850,5 @@
 #: build/trans_presets.java:619
 msgid "sand"
-msgstr ""
+msgstr "沙地"
 
 #. item "Ways/Track" text "Width (meters)"
@@ -12584,5 +12856,5 @@
 #: build/trans_presets.java:522
 msgid "Track Grade 1"
-msgstr ""
+msgstr "產業道路等級 1"
 
 #. item
@@ -12591,5 +12863,5 @@
 #: build/trans_presets.java:525
 msgid "Edit Track of grade 1"
-msgstr ""
+msgstr "編輯產業道路等級 1"
 
 #. item "Ways/Track Grade 1" text "Width (meters)"
@@ -12597,5 +12869,5 @@
 #: build/trans_presets.java:543
 msgid "Track Grade 2"
-msgstr ""
+msgstr "產業道路等級 2"
 
 #. item
@@ -12604,5 +12876,5 @@
 #: build/trans_presets.java:546
 msgid "Edit Track of grade 2"
-msgstr ""
+msgstr "編輯產業道路等級 2"
 
 #. item "Ways/Track Grade 2" text "Width (meters)"
@@ -12610,5 +12882,5 @@
 #: build/trans_presets.java:564
 msgid "Track Grade 3"
-msgstr ""
+msgstr "產業道路等級 3"
 
 #. item
@@ -12617,5 +12889,5 @@
 #: build/trans_presets.java:567
 msgid "Edit Track of grade 3"
-msgstr ""
+msgstr "編輯產業道路等級 3"
 
 #. item "Ways/Track Grade 3" text "Width (meters)"
@@ -12623,5 +12895,5 @@
 #: build/trans_presets.java:585
 msgid "Track Grade 4"
-msgstr ""
+msgstr "產業道路等級 4"
 
 #. item
@@ -12630,5 +12902,5 @@
 #: build/trans_presets.java:588
 msgid "Edit Track of grade 4"
-msgstr ""
+msgstr "編輯產業道路等級 4"
 
 #. item "Ways/Track Grade 4" text "Width (meters)"
@@ -12636,5 +12908,5 @@
 #: build/trans_presets.java:606
 msgid "Track Grade 5"
-msgstr ""
+msgstr "產業道路等級 5"
 
 #. item
@@ -12643,5 +12915,5 @@
 #: build/trans_presets.java:609
 msgid "Edit Track of grade 5"
-msgstr ""
+msgstr "編輯產業道路等級 5"
 
 #. item "Ways/Track Grade 5" text "Width (meters)"
@@ -12657,13 +12929,13 @@
 #: build/trans_presets.java:631
 msgid "Edit Path"
-msgstr ""
+msgstr "編輯小徑"
 
 #: build/trans_presets.java:637
 msgid "Snowmobile"
-msgstr ""
+msgstr "雪上摩托車"
 
 #: build/trans_presets.java:640
 msgid "Ski"
-msgstr ""
+msgstr "滑雪"
 
 #. item "Ways/Path" text "Width (meters)"
@@ -12671,5 +12943,5 @@
 #: build/trans_presets.java:655
 msgid "Hiking"
-msgstr ""
+msgstr "健走"
 
 #. item
@@ -12679,5 +12951,5 @@
 #: build/trans_presets.java:659
 msgid "Edit Hiking"
-msgstr ""
+msgstr "編輯健走"
 
 #. item "Ways/Hiking" text "Width (meters)"
@@ -12685,5 +12957,5 @@
 #: build/trans_presets.java:668
 msgid "Mountain Hiking"
-msgstr ""
+msgstr "登山"
 
 #. item
@@ -12693,5 +12965,5 @@
 #: build/trans_presets.java:672
 msgid "Edit Mountain Hiking"
-msgstr ""
+msgstr "編輯登山健行"
 
 #. item "Ways/Mountain Hiking" text "Width (meters)"
@@ -12699,5 +12971,5 @@
 #: build/trans_presets.java:681
 msgid "Demanding Mountain Hiking"
-msgstr ""
+msgstr "較難的登山健行"
 
 #. item
@@ -12707,5 +12979,5 @@
 #: build/trans_presets.java:685
 msgid "Edit Demanding Mountain Hiking"
-msgstr ""
+msgstr "編輯較難的登山健行"
 
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
@@ -12713,5 +12985,5 @@
 #: build/trans_presets.java:694
 msgid "Alpine Hiking"
-msgstr ""
+msgstr "高山健行"
 
 #. item
@@ -12721,5 +12993,5 @@
 #: build/trans_presets.java:698
 msgid "Edit Alpine Hiking"
-msgstr ""
+msgstr "編輯高山健行"
 
 #. item "Ways/Alpine Hiking" text "Width (meters)"
@@ -12727,5 +12999,5 @@
 #: build/trans_presets.java:707
 msgid "Demanding Alpine Hiking"
-msgstr ""
+msgstr "較難的高山健行"
 
 #. item
@@ -12735,5 +13007,5 @@
 #: build/trans_presets.java:711
 msgid "Edit Demanding Alpine Hiking"
-msgstr ""
+msgstr "編輯較難的高山健行"
 
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
@@ -12741,5 +13013,5 @@
 #: build/trans_presets.java:720
 msgid "Difficult Alpine Hiking"
-msgstr ""
+msgstr "較難的高山健行"
 
 #. item
@@ -12749,5 +13021,5 @@
 #: build/trans_presets.java:724
 msgid "Edit Difficult Alpine Hiking"
-msgstr ""
+msgstr "編輯較難的高山健行"
 
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
@@ -12755,10 +13027,10 @@
 #: build/trans_presets.java:734
 msgid "Waypoints"
-msgstr ""
+msgstr "路標"
 
 #. group "Waypoints"
 #: build/trans_presets.java:735
 msgid "Motorway Junction"
-msgstr ""
+msgstr "高速公路交流道"
 
 #. item
@@ -12766,15 +13038,15 @@
 #: build/trans_presets.java:737
 msgid "Edit Motorway Junction"
-msgstr ""
+msgstr "編輯高速公路交流道"
 
 #. item "Waypoints/Motorway Junction" text "Name"
 #: build/trans_presets.java:741
 msgid "Number"
-msgstr ""
+msgstr "編號"
 
 #. item "Waypoints/Motorway Junction" text "Number"
 #: build/trans_presets.java:743
 msgid "Services"
-msgstr ""
+msgstr "休息站"
 
 #. item
@@ -12782,5 +13054,5 @@
 #: build/trans_presets.java:745
 msgid "Edit Service Station"
-msgstr ""
+msgstr "編輯休息站"
 
 #. item "Waypoints/Services" text "Name"
@@ -12824,5 +13096,5 @@
 #: build/trans_presets.java:3001
 msgid "Operator"
-msgstr ""
+msgstr "經營者"
 
 #. item "Waypoints/Services" text "Operator"
@@ -12831,5 +13103,5 @@
 #: build/trans_presets.java:754
 msgid "Traffic Signal"
-msgstr ""
+msgstr "交通號誌"
 
 #. item
@@ -12839,5 +13111,5 @@
 #: build/trans_presets.java:758
 msgid "Pedestrian crossing type"
-msgstr ""
+msgstr "行人穿越道類型"
 
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
@@ -12847,20 +13119,20 @@
 #: build/trans_presets.java:1306
 msgid "uncontrolled"
-msgstr ""
+msgstr "沒有號誌"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
 #: build/trans_presets.java:1306
 msgid "traffic_signals"
-msgstr ""
+msgstr "交通號誌"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
 #: build/trans_presets.java:1306
 msgid "island"
-msgstr ""
+msgstr "安全島"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
 #: build/trans_presets.java:1306
 msgid "unmarked"
-msgstr ""
+msgstr "未畫標記"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
@@ -12875,5 +13147,5 @@
 #: build/trans_presets.java:1308
 msgid "Cross by bicycle"
-msgstr ""
+msgstr "以自行車穿越"
 
 #. item "Waypoints/Traffic Signal" check "Cross by bicycle"
@@ -12883,10 +13155,10 @@
 #: build/trans_presets.java:1309
 msgid "Crossing attendant"
-msgstr ""
+msgstr "有人陪同穿越"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
 #: build/trans_presets.java:762
 msgid "Crossing type name (UK)"
-msgstr ""
+msgstr "行人穿越道類型名稱 (英國)"
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
@@ -12894,5 +13166,5 @@
 #: build/trans_presets.java:762 build/trans_presets.java:777
 msgid "zebra"
-msgstr ""
+msgstr "斑馬線"
 
 #: build/trans_presets.java:762 build/trans_presets.java:777
@@ -12919,5 +13191,5 @@
 #: build/trans_presets.java:765
 msgid "Stop"
-msgstr ""
+msgstr "禁止通行"
 
 #. item
@@ -12925,5 +13197,5 @@
 #: build/trans_presets.java:768
 msgid "Pedestrian Crossing"
-msgstr ""
+msgstr "行人穿越道"
 
 #. item
@@ -12932,14 +13204,14 @@
 #: build/trans_presets.java:771
 msgid "Edit Crossing"
-msgstr ""
+msgstr "編輯行人穿越道"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #: build/trans_presets.java:777
 msgid "Type name (UK)"
-msgstr ""
+msgstr "類型名稱 (英國)"
 
 #: build/trans_presets.java:779
 msgid "Mini-roundabout"
-msgstr ""
+msgstr "小型圓環"
 
 #. item
@@ -12950,10 +13222,10 @@
 #: build/trans_presets.java:784
 msgid "Direction"
-msgstr ""
+msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
 #: build/trans_presets.java:784
 msgid "clockwise"
-msgstr ""
+msgstr "順時針"
 
 #: build/trans_presets.java:786
@@ -12967,20 +13239,20 @@
 #: build/trans_presets.java:791
 msgid "City Limit"
-msgstr ""
+msgstr "城市邊界"
 
 #. item
 #: build/trans_presets.java:792
 msgid "Edit City Limit Sign"
-msgstr ""
+msgstr "編輯城市邊界標誌"
 
 #. item "Waypoints/City Limit" text "Name"
 #: build/trans_presets.java:797
 msgid "Second Name"
-msgstr ""
+msgstr "第二名稱"
 
 #. item "Waypoints/City Limit" text "Second Name"
 #: build/trans_presets.java:799
 msgid "Speed Camera"
-msgstr ""
+msgstr "測速照相"
 
 #. item
@@ -12988,5 +13260,5 @@
 #: build/trans_presets.java:802
 msgid "Emergency Phone"
-msgstr ""
+msgstr "緊急電話"
 
 #. item
@@ -12994,5 +13266,5 @@
 #: build/trans_presets.java:805
 msgid "Incline"
-msgstr ""
+msgstr "坡"
 
 #. item
@@ -13000,5 +13272,5 @@
 #: build/trans_presets.java:808
 msgid "Incline Steep"
-msgstr ""
+msgstr "險升/降坡"
 
 #. item
@@ -13007,10 +13279,10 @@
 #: build/trans_presets.java:812
 msgid "Ford"
-msgstr ""
+msgstr "淺灘"
 
 #. item
 #: build/trans_presets.java:813
 msgid "Edit Ford"
-msgstr ""
+msgstr "編輯淺灘"
 
 #. item "Waypoints/Ford" text "Name"
@@ -13018,5 +13290,5 @@
 #: build/trans_presets.java:820
 msgid "Mountain Pass"
-msgstr ""
+msgstr "鞍部"
 
 #. item
@@ -13024,5 +13296,5 @@
 #: build/trans_presets.java:822
 msgid "Edit Mountain Pass"
-msgstr ""
+msgstr "編輯鞍部"
 
 #. item "Waypoints/Mountain Pass" text "Name"
@@ -13036,5 +13308,5 @@
 #: build/trans_presets.java:2702 build/trans_presets.java:2709
 msgid "Elevation"
-msgstr ""
+msgstr "海拔"
 
 #. item "Waypoints/Mountain Pass" text "Elevation"
@@ -13042,5 +13314,5 @@
 #: build/trans_presets.java:831
 msgid "Barriers"
-msgstr ""
+msgstr "障礙物"
 
 #. group "Barriers"
@@ -13048,5 +13320,5 @@
 #: build/trans_presets.java:834
 msgid "Bollard"
-msgstr ""
+msgstr "車阻柱"
 
 #. item
@@ -13054,5 +13326,5 @@
 #: build/trans_presets.java:836
 msgid "Edit Bollard"
-msgstr ""
+msgstr "編輯車阻柱"
 
 #. item "Barriers/Bollard" label "Edit Bollard"
@@ -13099,10 +13371,10 @@
 #: build/trans_presets.java:1002 build/trans_presets.java:1011
 msgid "Allowed traffic:"
-msgstr ""
+msgstr "允許通行方向："
 
 #. item "Barriers/Bollard" check "Motorcycle"
 #: build/trans_presets.java:846
 msgid "Cycle Barrier"
-msgstr ""
+msgstr "自行車護欄"
 
 #. item
@@ -13111,5 +13383,5 @@
 #: build/trans_presets.java:850
 msgid "Block"
-msgstr ""
+msgstr "水泥護欄"
 
 #. item
@@ -13117,5 +13389,5 @@
 #: build/trans_presets.java:853
 msgid "Cattle Grid"
-msgstr ""
+msgstr "家畜柵欄"
 
 #. item
@@ -13123,10 +13395,10 @@
 #: build/trans_presets.java:855
 msgid "Edit Cattle Grid"
-msgstr ""
+msgstr "編輯家畜柵欄"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
 #: build/trans_presets.java:865
 msgid "Bus Trap"
-msgstr ""
+msgstr "公車專用道障礙"
 
 #. item
@@ -13134,15 +13406,15 @@
 #: build/trans_presets.java:868
 msgid "Spikes"
-msgstr ""
+msgstr "長釘"
 
 #. item
 #: build/trans_presets.java:869
 msgid "Edit Spikes"
-msgstr ""
+msgstr "編輯長釘"
 
 #. item "Barriers/Spikes" check "Motorcar"
 #: build/trans_presets.java:880
 msgid "Toll Booth"
-msgstr ""
+msgstr "收費站"
 
 #. item
@@ -13150,5 +13422,5 @@
 #: build/trans_presets.java:882
 msgid "Edit Toll Booth"
-msgstr ""
+msgstr "編輯收費站"
 
 #. item "Barriers/Toll Booth" text "Operator"
@@ -13156,10 +13428,10 @@
 #: build/trans_presets.java:890
 msgid "Border Control"
-msgstr ""
+msgstr "國境管控站"
 
 #. item
 #: build/trans_presets.java:891
 msgid "Edit Border Control"
-msgstr ""
+msgstr "編輯國境管控站"
 
 #. item "Barriers/Border Control" check "Motorcar"
@@ -13169,5 +13441,5 @@
 #: build/trans_presets.java:905
 msgid "Hedge"
-msgstr ""
+msgstr "籬笆"
 
 #. item
@@ -13176,5 +13448,5 @@
 #: build/trans_presets.java:909
 msgid "Fence"
-msgstr ""
+msgstr "欄柵"
 
 #. item
@@ -13183,5 +13455,5 @@
 #: build/trans_presets.java:913
 msgid "Wall"
-msgstr ""
+msgstr "牆"
 
 #. item
@@ -13189,5 +13461,5 @@
 #: build/trans_presets.java:916
 msgid "City Wall"
-msgstr ""
+msgstr "城牆"
 
 #. item
@@ -13196,5 +13468,5 @@
 #: build/trans_presets.java:920
 msgid "Retaining Wall"
-msgstr ""
+msgstr "擋土牆"
 
 #. item
@@ -13206,15 +13478,15 @@
 #: build/trans_presets.java:927
 msgid "Entrance"
-msgstr ""
+msgstr "入口"
 
 #. item
 #: build/trans_presets.java:928
 msgid "Edit Entrance"
-msgstr ""
+msgstr "編輯入口"
 
 #. item "Barriers/Entrance" check "Motorcar"
 #: build/trans_presets.java:939
 msgid "Gate"
-msgstr ""
+msgstr "閘門"
 
 #. item
@@ -13222,5 +13494,5 @@
 #: build/trans_presets.java:941
 msgid "Edit Gate"
-msgstr ""
+msgstr "編輯閘門"
 
 #. item "Barriers/Gate" check "Motorcar"
@@ -13278,10 +13550,10 @@
 #: build/trans_presets.java:1007
 msgid "Sally Port"
-msgstr ""
+msgstr "城門"
 
 #. item
 #: build/trans_presets.java:1008
 msgid "Edit Sally Port"
-msgstr ""
+msgstr "編輯城門"
 
 #. item "Barriers/Sally Port" check "Motorcar"
@@ -13292,10 +13564,10 @@
 #: build/trans_presets.java:1022 build/trans_presets.java:1065
 msgid "Water"
-msgstr ""
+msgstr "水域"
 
 #. group "Water"
 #: build/trans_presets.java:1023
 msgid "Spring"
-msgstr ""
+msgstr "泉"
 
 #. item
@@ -13303,5 +13575,5 @@
 #: build/trans_presets.java:1025
 msgid "Edit Spring"
-msgstr ""
+msgstr "編輯泉"
 
 #. item "Water/Spring" text "Name"
@@ -13320,5 +13592,5 @@
 #: build/trans_presets.java:1038
 msgid "Stream"
-msgstr ""
+msgstr "溪流"
 
 #. item
@@ -13326,10 +13598,10 @@
 #: build/trans_presets.java:1040
 msgid "Edit Stream"
-msgstr ""
+msgstr "編輯溪流"
 
 #. item "Water/Stream" combo "Layer"
 #: build/trans_presets.java:1046
 msgid "Canal"
-msgstr ""
+msgstr "運河"
 
 #. item
@@ -13337,10 +13609,10 @@
 #: build/trans_presets.java:1048
 msgid "Edit Canal"
-msgstr ""
+msgstr "編輯運河"
 
 #. item "Water/Canal" combo "Layer"
 #: build/trans_presets.java:1054
 msgid "River"
-msgstr ""
+msgstr "河流"
 
 #. item
@@ -13350,5 +13622,5 @@
 #: build/trans_presets.java:1058
 msgid "Edit River"
-msgstr ""
+msgstr "編輯河流"
 
 #. item
@@ -13356,15 +13628,15 @@
 #: build/trans_presets.java:1067
 msgid "Edit Water"
-msgstr ""
+msgstr "編輯水域"
 
 #. item "Water/Water" text "Name"
 #: build/trans_presets.java:1071
 msgid "Land"
-msgstr ""
+msgstr "陸地"
 
 #. item
 #: build/trans_presets.java:1072
 msgid "Edit Land"
-msgstr ""
+msgstr "編輯陸地"
 
 #. item "Water/Land" text "Name"
@@ -13382,5 +13654,5 @@
 #: build/trans_presets.java:1083
 msgid "Reservoir"
-msgstr ""
+msgstr "貯水處"
 
 #. item
@@ -13388,15 +13660,15 @@
 #: build/trans_presets.java:1085
 msgid "Edit Reservoir Landuse"
-msgstr ""
+msgstr "編輯貯水處"
 
 #. item "Water/Reservoir" text "Name"
 #: build/trans_presets.java:1090
 msgid "Covered Reservoir"
-msgstr ""
+msgstr "有覆蓋的貯水處"
 
 #. item
 #: build/trans_presets.java:1091
 msgid "Edit Covered Reservoir"
-msgstr ""
+msgstr "編輯有覆蓋的貯水處"
 
 #. item "Water/Covered Reservoir" text "Name"
@@ -13404,5 +13676,5 @@
 #: build/trans_presets.java:1096
 msgid "Riverbank"
-msgstr ""
+msgstr "河岸"
 
 #. item
@@ -13411,10 +13683,10 @@
 #: build/trans_presets.java:1099
 msgid "Edit Riverbank"
-msgstr ""
+msgstr "編輯河岸"
 
 #. item "Water/Riverbank" text "Name"
 #: build/trans_presets.java:1103
 msgid "Wetland"
-msgstr ""
+msgstr "溼地"
 
 #. item
@@ -13425,14 +13697,14 @@
 #: build/trans_presets.java:1108
 msgid "Edit Wetland"
-msgstr ""
+msgstr "編輯溼地"
 
 #. item "Water/Wetland" combo "Type"
 #: build/trans_presets.java:1111
 msgid "swamp"
-msgstr ""
+msgstr "沼澤"
 
 #: build/trans_presets.java:1111
 msgid "bog"
-msgstr ""
+msgstr "泥沼"
 
 #. color deprecated
@@ -13444,5 +13716,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr ""
@@ -13462,5 +13734,5 @@
 #: build/trans_presets.java:1111
 msgid "mangrove"
-msgstr ""
+msgstr "紅樹林"
 
 #: build/trans_presets.java:1113
@@ -13476,5 +13748,5 @@
 #: build/trans_presets.java:1118
 msgid "Beach"
-msgstr ""
+msgstr "海灘"
 
 #. item
@@ -13482,20 +13754,20 @@
 #: build/trans_presets.java:1120
 msgid "Edit Beach"
-msgstr ""
+msgstr "編輯海灘"
 
 #. item "Water/Beach" text "Name"
 #: build/trans_presets.java:1124
 msgid "Bay"
-msgstr ""
+msgstr "海灣"
 
 #. item
 #: build/trans_presets.java:1125
 msgid "Edit Bay"
-msgstr ""
+msgstr "編輯海灣"
 
 #. item "Water/Bay" text "Name"
 #: build/trans_presets.java:1129
 msgid "Cliff"
-msgstr ""
+msgstr "斷崖"
 
 #. item
@@ -13503,10 +13775,10 @@
 #: build/trans_presets.java:1131
 msgid "Edit Cliff"
-msgstr ""
+msgstr "編輯斷崖"
 
 #. item "Water/Cliff" text "Name"
 #: build/trans_presets.java:1135
 msgid "Coastline"
-msgstr ""
+msgstr "海岸線"
 
 #. item
@@ -13514,5 +13786,5 @@
 #: build/trans_presets.java:1137
 msgid "Edit Coastline"
-msgstr ""
+msgstr "編輯海岸線"
 
 #. item "Water/Coastline" text "Name"
@@ -13520,5 +13792,5 @@
 #: build/trans_presets.java:1142
 msgid "Ferry Route"
-msgstr ""
+msgstr "渡輪路線"
 
 #. item
@@ -13526,5 +13798,5 @@
 #: build/trans_presets.java:1144
 msgid "Edit Ferry"
-msgstr ""
+msgstr "編輯渡輪"
 
 #. item "Water/Ferry Route" text "Name"
@@ -13544,5 +13816,5 @@
 #: build/trans_presets.java:1159
 msgid "Dock"
-msgstr ""
+msgstr "船塢"
 
 #. item
@@ -13550,5 +13822,5 @@
 #: build/trans_presets.java:1161
 msgid "Edit Dock"
-msgstr ""
+msgstr "編輯船塢"
 
 #. item "Water/Dock" text "Name"
@@ -13556,5 +13828,5 @@
 #: build/trans_presets.java:1167
 msgid "Dam"
-msgstr ""
+msgstr "水壩"
 
 #. item
@@ -13562,15 +13834,15 @@
 #: build/trans_presets.java:1169
 msgid "Edit Dam"
-msgstr ""
+msgstr "編輯水壩"
 
 #. item "Water/Dam" text "Name"
 #: build/trans_presets.java:1175
 msgid "Waterway Point"
-msgstr ""
+msgstr "水路點"
 
 #. group "Waterway Point"
 #: build/trans_presets.java:1176
 msgid "Lock Gate"
-msgstr ""
+msgstr "調節水門"
 
 #. item
@@ -13579,5 +13851,5 @@
 #: build/trans_presets.java:1180
 msgid "Weir"
-msgstr ""
+msgstr "堰"
 
 #. item
@@ -13585,15 +13857,15 @@
 #: build/trans_presets.java:1182
 msgid "Edit Weir"
-msgstr ""
+msgstr "編輯堰"
 
 #. item "Waterway Point/Weir" text "Name"
 #: build/trans_presets.java:1187
 msgid "Waterfall"
-msgstr ""
+msgstr "瀑布"
 
 #. item
 #: build/trans_presets.java:1188
 msgid "Edit Waterfall"
-msgstr ""
+msgstr "編輯瀑布"
 
 #. item "Waterway Point/Waterfall" text "Name"
@@ -13607,15 +13879,15 @@
 #: build/trans_presets.java:1197
 msgid "Marina"
-msgstr ""
+msgstr "碼頭"
 
 #. item
 #: build/trans_presets.java:1198
 msgid "Edit Marina"
-msgstr ""
+msgstr "編輯碼頭"
 
 #. item "Waterway Point/Marina" text "Name"
 #: build/trans_presets.java:1202
 msgid "Pier"
-msgstr ""
+msgstr "渡頭"
 
 #. item
@@ -13623,10 +13895,10 @@
 #: build/trans_presets.java:1204
 msgid "Edit Pier"
-msgstr ""
+msgstr "編輯渡頭"
 
 #. item "Waterway Point/Pier" text "Name"
 #: build/trans_presets.java:1208
 msgid "Ferry Terminal"
-msgstr ""
+msgstr "渡輪端點"
 
 #. item
@@ -13634,10 +13906,10 @@
 #: build/trans_presets.java:1210
 msgid "Edit Ferry Terminal"
-msgstr ""
+msgstr "編輯渡輪端點"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
 #: build/trans_presets.java:1214
 msgid "Slipway"
-msgstr ""
+msgstr "船臺"
 
 #. item
@@ -13647,5 +13919,5 @@
 #: build/trans_presets.java:1218
 msgid "Edit Slipway"
-msgstr ""
+msgstr "編輯造船臺"
 
 #. item "Waterway Point/Slipway" text "Name"
@@ -13653,10 +13925,10 @@
 #: build/trans_presets.java:1224
 msgid "Railway"
-msgstr ""
+msgstr "鐵路"
 
 #. group "Railway"
 #: build/trans_presets.java:1225
 msgid "Rail"
-msgstr ""
+msgstr "軌"
 
 #. item
@@ -13664,5 +13936,5 @@
 #: build/trans_presets.java:1227
 msgid "Edit Rail"
-msgstr ""
+msgstr "編輯軌道"
 
 #. item "Railway/Rail" label "Edit Rail"
@@ -13695,5 +13967,5 @@
 #: build/trans_presets.java:1267 build/trans_presets.java:1292
 msgid "Optional Types"
-msgstr ""
+msgstr "選擇性的類型"
 
 #. item "Railway/Rail" combo "Optional Types"
@@ -13728,14 +14000,14 @@
 #: build/trans_presets.java:1232
 msgid "Narrow Gauge Rail"
-msgstr ""
+msgstr "窄軌"
 
 #. item
 #: build/trans_presets.java:1233
 msgid "Edit Narrow Gauge Rail"
-msgstr ""
+msgstr "編輯窄軌"
 
 #: build/trans_presets.java:1238
 msgid "Monorail"
-msgstr ""
+msgstr "單軌"
 
 #. item
@@ -13743,45 +14015,45 @@
 #: build/trans_presets.java:1240
 msgid "Edit Monorail"
-msgstr ""
+msgstr "編輯單軌"
 
 #: build/trans_presets.java:1245
 msgid "Preserved"
-msgstr ""
+msgstr "保留鐵路"
 
 #. item
 #: build/trans_presets.java:1246
 msgid "Edit Preserved Railway"
-msgstr ""
+msgstr "編輯保留的鐵路"
 
 #: build/trans_presets.java:1251
 msgid "Light Rail"
-msgstr ""
+msgstr "輕軌電車"
 
 #. item
 #: build/trans_presets.java:1252
 msgid "Edit Light Rail"
-msgstr ""
+msgstr "編輯輕軌電車"
 
 #: build/trans_presets.java:1257
 msgid "Subway"
-msgstr ""
+msgstr "地下鐵"
 
 #. item
 #: build/trans_presets.java:1258
 msgid "Edit Subway"
-msgstr ""
+msgstr "編輯地下鐵"
 
 #: build/trans_presets.java:1263
 msgid "Tram"
-msgstr ""
+msgstr "路面電車"
 
 #. item
 #: build/trans_presets.java:1264
 msgid "Edit Tram"
-msgstr ""
+msgstr "編輯路面電車"
 
 #: build/trans_presets.java:1269
 msgid "Bus Guideway"
-msgstr ""
+msgstr "導軌道巴士"
 
 #. item
@@ -13789,5 +14061,5 @@
 #: build/trans_presets.java:1271
 msgid "Edit Bus Guideway"
-msgstr ""
+msgstr "編輯導軌道巴士"
 
 #. item "Railway/Bus Guideway" text "Width (meters)"
@@ -13796,14 +14068,14 @@
 #: build/trans_presets.java:1288
 msgid "Disused Rail"
-msgstr ""
+msgstr "不使用的軌道"
 
 #. item
 #: build/trans_presets.java:1289
 msgid "Edit Disused Railway"
-msgstr ""
+msgstr "編輯不使用的鐵路"
 
 #: build/trans_presets.java:1294
 msgid "Abandoned Rail"
-msgstr ""
+msgstr "廢棄的軌道"
 
 #. item
@@ -13812,5 +14084,5 @@
 #: build/trans_presets.java:1298
 msgid "Level Crossing"
-msgstr ""
+msgstr "鐵路平交道"
 
 #. item
@@ -13819,5 +14091,5 @@
 #: build/trans_presets.java:1302
 msgid "Crossing"
-msgstr ""
+msgstr "平交道"
 
 #. item
@@ -13827,5 +14099,5 @@
 #: build/trans_presets.java:1306
 msgid "Crossing type"
-msgstr ""
+msgstr "平交道類型"
 
 #. item "Railway/Crossing" check "Crossing attendant"
@@ -13833,5 +14105,5 @@
 #: build/trans_presets.java:1312
 msgid "Turntable"
-msgstr ""
+msgstr "調車轉盤"
 
 #. item
@@ -13840,10 +14112,10 @@
 #: build/trans_presets.java:1317
 msgid "Aerialway"
-msgstr ""
+msgstr "空中路線"
 
 #. group "Aerialway"
 #: build/trans_presets.java:1318
 msgid "Chair Lift"
-msgstr ""
+msgstr "滑雪纜車"
 
 #. item
@@ -13851,5 +14123,5 @@
 #: build/trans_presets.java:1320
 msgid "Edit Chair Lift"
-msgstr ""
+msgstr "編輯滑雪纜車"
 
 #. item "Aerialway/Chair Lift" text "Name"
@@ -13867,5 +14139,5 @@
 #: build/trans_presets.java:1330
 msgid "Cable Car"
-msgstr ""
+msgstr "纜車"
 
 #. item
@@ -13873,5 +14145,5 @@
 #: build/trans_presets.java:1332
 msgid "Edit Cable Car"
-msgstr ""
+msgstr "編輯纜車"
 
 #. item "Aerialway/Cable Car" text "Name"
@@ -13890,5 +14162,5 @@
 #: build/trans_presets.java:1342 build/trans_presets.java:1430
 msgid "Station"
-msgstr ""
+msgstr "車站"
 
 #. item
@@ -13899,10 +14171,10 @@
 #: build/trans_presets.java:1344 build/trans_presets.java:1433
 msgid "Edit Station"
-msgstr ""
+msgstr "編輯車站"
 
 #. group "Car"
 #: build/trans_presets.java:1351
 msgid "Fuel"
-msgstr ""
+msgstr "加油站"
 
 #. item
@@ -13912,5 +14184,5 @@
 #: build/trans_presets.java:1355
 msgid "Edit Fuel"
-msgstr ""
+msgstr "編輯加油站"
 
 #. item "Car/Fuel" text "Operator"
@@ -13927,5 +14199,5 @@
 #: build/trans_surveyor.java:24
 msgid "Parking"
-msgstr ""
+msgstr "停車場"
 
 #. item
@@ -13934,5 +14206,5 @@
 #: build/trans_presets.java:1363
 msgid "Edit Parking"
-msgstr ""
+msgstr "編輯停車場"
 
 #. item "Car/Parking" text "Name"
@@ -13940,18 +14212,18 @@
 #: build/trans_presets.java:1366 build/trans_presets.java:1412
 msgid "Capacity"
-msgstr ""
+msgstr "容量"
 
 #. item "Car/Parking" combo "Type"
 #: build/trans_presets.java:1367
 msgid "surface"
-msgstr ""
+msgstr "平面式"
 
 #: build/trans_presets.java:1367
 msgid "multi-storey"
-msgstr ""
+msgstr "塔式"
 
 #: build/trans_presets.java:1367
 msgid "underground"
-msgstr ""
+msgstr "地下"
 
 #: build/trans_presets.java:1367
@@ -13961,20 +14233,20 @@
 #: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
-msgstr ""
+msgstr "殘障專用空間"
 
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1369 build/trans_presets.java:2309
 msgid "Fee"
-msgstr ""
+msgstr "費用"
 
 #. item "Car/Parking" check "Fee"
 #: build/trans_presets.java:1371
 msgid "Wash"
-msgstr ""
+msgstr "洗車場"
 
 #. item
 #: build/trans_presets.java:1372
 msgid "Edit Car Wash"
-msgstr ""
+msgstr "編輯"
 
 #. item "Car/Wash" text "Operator"
@@ -13982,5 +14254,5 @@
 #: build/trans_presets.java:1377 build/trans_presets.java:1421
 msgid "Shop"
-msgstr ""
+msgstr "商店"
 
 #. item
@@ -13988,15 +14260,15 @@
 #: build/trans_presets.java:1379
 msgid "Edit Car Shop"
-msgstr ""
+msgstr "編輯汽車商店"
 
 #. item "Car/Shop" text "Operator"
 #: build/trans_presets.java:1384
 msgid "Repair"
-msgstr ""
+msgstr "修車場"
 
 #. item
 #: build/trans_presets.java:1385
 msgid "Edit Car Repair"
-msgstr ""
+msgstr "編輯修車場"
 
 #. item "Car/Repair" text "Operator"
@@ -14004,5 +14276,5 @@
 #: build/trans_presets.java:1390 build/trans_presets.java:1414
 msgid "Rental"
-msgstr ""
+msgstr "租車"
 
 #. item
@@ -14011,5 +14283,5 @@
 #: build/trans_presets.java:1393
 msgid "Edit Car Rental"
-msgstr ""
+msgstr "編輯租車"
 
 #. item "Car/Rental" text "Operator"
@@ -14028,5 +14300,5 @@
 #: build/trans_presets.java:1409
 msgid "Edit Bicycle Parking"
-msgstr ""
+msgstr "編輯自行車停車場"
 
 #. item
@@ -14035,5 +14307,5 @@
 #: build/trans_presets.java:1417
 msgid "Edit Bicycle Rental"
-msgstr ""
+msgstr "編輯自行車租用點"
 
 #. item
@@ -14042,10 +14314,10 @@
 #: build/trans_presets.java:1424
 msgid "Edit Bicycle Shop"
-msgstr ""
+msgstr "編輯自行車商店"
 
 #. item "Bicycle/Shop" text "Name"
 #: build/trans_presets.java:1429
 msgid "Public Transport"
-msgstr ""
+msgstr "大眾運輸"
 
 #. item "Public Transport/Station" text "Name"
@@ -14070,5 +14342,5 @@
 #: build/trans_presets.java:1450
 msgid "Tram Stop"
-msgstr ""
+msgstr "路面電車停靠"
 
 #. item
@@ -14077,5 +14349,5 @@
 #: build/trans_presets.java:1453
 msgid "Edit Tram Stop"
-msgstr ""
+msgstr "編輯路面電車停靠"
 
 #. item "Public Transport/Tram Stop" text "Name"
@@ -14083,5 +14355,5 @@
 #: build/trans_presets.java:1460
 msgid "Railway Platform"
-msgstr ""
+msgstr "鐵路月台"
 
 #. item
@@ -14090,5 +14362,5 @@
 #: build/trans_presets.java:1463
 msgid "Edit Railway Platform"
-msgstr ""
+msgstr "編輯鐵路月台"
 
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
@@ -14106,10 +14378,10 @@
 #: build/trans_presets.java:1468 build/trans_presets.java:1510
 msgid "Area"
-msgstr ""
+msgstr "區域"
 
 #. item "Public Transport/Railway Platform" check "Area"
 #: build/trans_presets.java:1470
 msgid "Subway Entrance"
-msgstr ""
+msgstr "地下鐵入口"
 
 #. item
@@ -14118,5 +14390,5 @@
 #: build/trans_presets.java:1473
 msgid "Edit Subway Entrance"
-msgstr ""
+msgstr "編輯地下鐵入口"
 
 #. item "Public Transport/Subway Entrance" text "Name"
@@ -14130,5 +14402,5 @@
 #: build/trans_presets.java:1483
 msgid "Bus Station"
-msgstr ""
+msgstr "公車車站"
 
 #. item
@@ -14137,5 +14409,5 @@
 #: build/trans_presets.java:1486
 msgid "Edit Bus Station"
-msgstr ""
+msgstr "編輯公車車站"
 
 #. item "Public Transport/Bus Station" text "Name"
@@ -14143,5 +14415,5 @@
 #: build/trans_presets.java:1492
 msgid "Bus Stop"
-msgstr ""
+msgstr "公車站牌"
 
 #. item
@@ -14151,5 +14423,5 @@
 #: build/trans_presets.java:1496
 msgid "Edit Bus Stop"
-msgstr ""
+msgstr "編輯公車站牌"
 
 #. item "Public Transport/Bus Stop" text "Name"
@@ -14167,10 +14439,10 @@
 #: build/trans_presets.java:1504
 msgid "Bus Platform"
-msgstr ""
+msgstr "公車月台"
 
 #. item
 #: build/trans_presets.java:1505
 msgid "Edit Bus Platform"
-msgstr ""
+msgstr "編輯公車月台"
 
 #. item "Public Transport/Bus Platform" check "Area"
@@ -14184,5 +14456,5 @@
 #: build/trans_presets.java:1515
 msgid "Edit Taxi station"
-msgstr ""
+msgstr "編輯計程車招呼站"
 
 #. item "Public Transport/Taxi" text "Name"
@@ -14196,5 +14468,5 @@
 #: build/trans_presets.java:1522
 msgid "Edit Airport"
-msgstr ""
+msgstr "編輯機場"
 
 #. item "Public Transport/Airport" text "Reference"
@@ -14223,5 +14495,5 @@
 #: build/trans_presets.java:1534 build/trans_surveyor.java:43
 msgid "Hotel"
-msgstr ""
+msgstr "旅館"
 
 #. item
@@ -14230,15 +14502,15 @@
 #: build/trans_presets.java:1537
 msgid "Edit Hotel"
-msgstr ""
+msgstr "編輯旅館"
 
 #. item "Accomodation/Hotel" text "Name"
 #: build/trans_presets.java:1540
 msgid "Stars"
-msgstr ""
+msgstr "星級"
 
 #. item "Accomodation/Hotel" combo "Stars"
 #: build/trans_presets.java:1542
 msgid "Motel"
-msgstr ""
+msgstr "汽車旅館"
 
 #. item
@@ -14246,5 +14518,5 @@
 #: build/trans_presets.java:1544
 msgid "Edit Motel"
-msgstr ""
+msgstr "編輯汽車旅館"
 
 #. item "Accomodation/Motel" text "Name"
@@ -14303,5 +14575,5 @@
 #: build/trans_presets.java:1576
 msgid "Camping Site"
-msgstr ""
+msgstr "露營區"
 
 #. item
@@ -14309,10 +14581,10 @@
 #: build/trans_presets.java:1578
 msgid "Edit Camping Site"
-msgstr ""
+msgstr "編輯露營區"
 
 #. item "Accomodation/Camping Site" text "Name"
 #: build/trans_presets.java:1583
 msgid "Food+Drinks"
-msgstr ""
+msgstr "食物+飲料"
 
 #. group "Food+Drinks"
@@ -14323,5 +14595,5 @@
 #: build/trans_presets.java:1584 build/trans_surveyor.java:47
 msgid "Restaurant"
-msgstr ""
+msgstr "餐廳"
 
 #. item
@@ -14329,5 +14601,5 @@
 #: build/trans_presets.java:1586
 msgid "Edit Restaurant"
-msgstr ""
+msgstr "編輯餐廳"
 
 #. item "Food+Drinks/Restaurant" text "Name"
@@ -14335,5 +14607,5 @@
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "Cuisine"
-msgstr ""
+msgstr "烹調風格"
 
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
@@ -14349,9 +14621,9 @@
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "pizza"
-msgstr ""
+msgstr "披薩"
 
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "burger"
-msgstr ""
+msgstr "漢堡"
 
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
@@ -14365,9 +14637,9 @@
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "indian"
-msgstr ""
+msgstr "印度料理"
 
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "regional"
-msgstr ""
+msgstr "地方料理"
 
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
@@ -14377,9 +14649,9 @@
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "turkish"
-msgstr ""
+msgstr "土耳其料理"
 
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "asian"
-msgstr ""
+msgstr "亞洲料理"
 
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
@@ -14389,5 +14661,5 @@
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
 msgid "mexican"
-msgstr ""
+msgstr "墨西哥料理"
 
 #: build/trans_presets.java:1589 build/trans_presets.java:1596
@@ -14397,5 +14669,5 @@
 #: build/trans_presets.java:1591
 msgid "Fast Food"
-msgstr ""
+msgstr "速食"
 
 #. item
@@ -14403,9 +14675,9 @@
 #: build/trans_presets.java:1593
 msgid "Edit Fast Food Restaurant"
-msgstr ""
+msgstr "編輯速食餐廳"
 
 #: build/trans_presets.java:1598
 msgid "Cafe"
-msgstr ""
+msgstr "咖啡"
 
 #. item
@@ -14413,10 +14685,10 @@
 #: build/trans_presets.java:1600
 msgid "Edit Cafe"
-msgstr ""
+msgstr "編輯咖啡廳"
 
 #. item "Food+Drinks/Cafe" text "Name"
 #: build/trans_presets.java:1604
 msgid "Pub"
-msgstr ""
+msgstr "酒店"
 
 #. item
@@ -14424,5 +14696,5 @@
 #: build/trans_presets.java:1606
 msgid "Edit Pub"
-msgstr ""
+msgstr "編輯酒店"
 
 #. item "Food+Drinks/Pub" text "Name"
@@ -14439,5 +14711,5 @@
 #: build/trans_presets.java:1615
 msgid "Bar"
-msgstr ""
+msgstr "酒吧"
 
 #. item
@@ -14445,10 +14717,10 @@
 #: build/trans_presets.java:1617
 msgid "Edit Bar"
-msgstr ""
+msgstr "編輯酒吧"
 
 #. item "Food+Drinks/Bar" text "Name"
 #: build/trans_presets.java:1621
 msgid "Nightclub"
-msgstr ""
+msgstr "夜店"
 
 #. item
@@ -14456,20 +14728,20 @@
 #: build/trans_presets.java:1623
 msgid "Edit Nightclub"
-msgstr ""
+msgstr "編輯夜店"
 
 #. item "Food+Drinks/Nightclub" text "Name"
 #: build/trans_presets.java:1628
 msgid "Tourism"
-msgstr ""
+msgstr "旅遊相關"
 
 #. group "Tourism"
 #: build/trans_presets.java:1629
 msgid "Attraction"
-msgstr ""
+msgstr "吸引力點"
 
 #. item
 #: build/trans_presets.java:1630
 msgid "Edit Attraction"
-msgstr ""
+msgstr "編輯吸引力點"
 
 #. item "Tourism/Attraction" text "Name"
@@ -14484,5 +14756,5 @@
 #: build/trans_presets.java:1635
 msgid "Museum"
-msgstr ""
+msgstr "博物館"
 
 #. item
@@ -14490,10 +14762,10 @@
 #: build/trans_presets.java:1637
 msgid "Edit Museum"
-msgstr ""
+msgstr "編輯博物館"
 
 #. item "Tourism/Museum" text "Name"
 #: build/trans_presets.java:1641
 msgid "Zoo"
-msgstr ""
+msgstr "動物園"
 
 #. item
@@ -14502,10 +14774,10 @@
 #: build/trans_presets.java:1644
 msgid "Edit Zoo"
-msgstr ""
+msgstr "編輯動物園"
 
 #. item "Tourism/Zoo" text "Name"
 #: build/trans_presets.java:1648
 msgid "Viewpoint"
-msgstr ""
+msgstr "景點"
 
 #. item
@@ -14513,5 +14785,5 @@
 #: build/trans_presets.java:1650
 msgid "Edit Viewpoint"
-msgstr ""
+msgstr "編輯景點"
 
 #. item "Tourism/Viewpoint" text "Name"
@@ -14523,15 +14795,15 @@
 #: build/trans_presets.java:1655
 msgid "Theme Park"
-msgstr ""
+msgstr "主題樂園"
 
 #. item
 #: build/trans_presets.java:1656
 msgid "Edit Theme Park"
-msgstr ""
+msgstr "編輯主題樂園"
 
 #. item "Tourism/Theme Park" text "Name"
 #: build/trans_presets.java:1660
 msgid "Artwork"
-msgstr ""
+msgstr "藝術工作"
 
 #. item
@@ -14539,5 +14811,5 @@
 #: build/trans_presets.java:1662
 msgid "Edit Artwork"
-msgstr ""
+msgstr "編輯藝術工作"
 
 #. item "Tourism/Artwork" text "Name"
@@ -14545,5 +14817,5 @@
 #: build/trans_presets.java:1667
 msgid "Information Office"
-msgstr ""
+msgstr "資訊服務處"
 
 #. item
@@ -14551,32 +14823,32 @@
 #: build/trans_presets.java:1669
 msgid "Edit Information Office"
-msgstr ""
+msgstr "編輯資訊服務處"
 
 #. item "Tourism/Information Office" text "Opening Hours"
 #: build/trans_presets.java:1675
 msgid "Map"
-msgstr ""
+msgstr "地圖"
 
 #. item "Tourism/Map" text "Name"
 #: build/trans_presets.java:1679
 msgid "Map Type"
-msgstr ""
+msgstr "地圖類型"
 
 #. item "Tourism/Map" combo "Map Type"
 #: build/trans_presets.java:1679
 msgid "map"
-msgstr ""
+msgstr "地圖"
 
 #: build/trans_presets.java:1679
 msgid "citymap"
-msgstr ""
+msgstr "城市地圖"
 
 #: build/trans_presets.java:1679
 msgid "hikingmap"
-msgstr ""
+msgstr "健行地圖"
 
 #: build/trans_presets.java:1679
 msgid "bicyclemap"
-msgstr ""
+msgstr "自行車地圖"
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -14589,10 +14861,10 @@
 #: build/trans_presets.java:1682
 msgid "Information Board"
-msgstr ""
+msgstr "資訊板"
 
 #. item "Tourism/Information Board" text "Name"
 #: build/trans_presets.java:1686
 msgid "Board Type"
-msgstr ""
+msgstr "板的類型"
 
 #. item "Tourism/Information Board" combo "Board Type"
@@ -14603,23 +14875,23 @@
 #: build/trans_presets.java:1686
 msgid "history"
-msgstr ""
+msgstr "歷史"
 
 #: build/trans_presets.java:1686
 msgid "nature"
-msgstr ""
+msgstr "自然"
 
 #: build/trans_presets.java:1686
 msgid "wildlife"
-msgstr ""
+msgstr "野生"
 
 #. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1689
 msgid "Guidepost (Hiking)"
-msgstr ""
+msgstr "路標（徒步）"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
 #: build/trans_presets.java:1696
 msgid "Other Information Points"
-msgstr ""
+msgstr "其他的資訊點"
 
 #. item
@@ -14637,20 +14909,20 @@
 #: build/trans_presets.java:1709
 msgid "Picnic Site"
-msgstr ""
+msgstr "野餐區"
 
 #. item
 #: build/trans_presets.java:1710
 msgid "Edit Picnic Site"
-msgstr ""
+msgstr "編輯野餐區"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
 #: build/trans_presets.java:1716
 msgid "Historic Places"
-msgstr ""
+msgstr "歷史地區"
 
 #. group "Historic Places"
 #: build/trans_presets.java:1717
 msgid "Castle"
-msgstr ""
+msgstr "城堡"
 
 #. item
@@ -14659,20 +14931,20 @@
 #: build/trans_presets.java:1720
 msgid "Edit Castle"
-msgstr ""
+msgstr "編輯城堡"
 
 #. item "Historic Places/Castle" text "Name"
 #: build/trans_presets.java:1724
 msgid "Ruins"
-msgstr ""
+msgstr "遺跡"
 
 #. item
 #: build/trans_presets.java:1725
 msgid "Edit Ruins"
-msgstr ""
+msgstr "編輯遺跡"
 
 #. item "Historic Places/Ruins" text "Name"
 #: build/trans_presets.java:1729
 msgid "Archaeological Site"
-msgstr ""
+msgstr "考古學地區"
 
 #. item
@@ -14681,10 +14953,10 @@
 #: build/trans_presets.java:1732
 msgid "Edit Archaeological Site"
-msgstr ""
+msgstr "編輯考古學地區"
 
 #. item "Historic Places/Archaeological Site" text "Name"
 #: build/trans_presets.java:1736
 msgid "Battlefield"
-msgstr ""
+msgstr "戰場"
 
 #. item
@@ -14692,5 +14964,5 @@
 #: build/trans_presets.java:1738
 msgid "Edit Battlefield"
-msgstr ""
+msgstr "編輯戰場"
 
 #. item "Historic Places/Battlefield" text "Name"
@@ -14698,15 +14970,15 @@
 #: build/trans_presets.java:1743
 msgid "Monument"
-msgstr ""
+msgstr "紀念建築"
 
 #. item
 #: build/trans_presets.java:1744
 msgid "Edit Monument"
-msgstr ""
+msgstr "編輯紀念建築"
 
 #. item "Historic Places/Monument" text "Name"
 #: build/trans_presets.java:1748
 msgid "Memorial"
-msgstr ""
+msgstr "紀念碑"
 
 #. item
@@ -14714,5 +14986,5 @@
 #: build/trans_presets.java:1750
 msgid "Edit Memorial"
-msgstr ""
+msgstr "編輯紀念碑"
 
 #. item "Historic Places/Memorial" text "Name"
@@ -14739,20 +15011,20 @@
 #: build/trans_presets.java:1765
 msgid "Leisure"
-msgstr ""
+msgstr "休閒"
 
 #. group "Leisure"
 #: build/trans_presets.java:1766
 msgid "Water Park"
-msgstr ""
+msgstr "水上樂園"
 
 #. item
 #: build/trans_presets.java:1767
 msgid "Edit Water Park"
-msgstr ""
+msgstr "編輯水上樂園"
 
 #. item "Leisure/Water Park" text "Name"
 #: build/trans_presets.java:1771
 msgid "Playground"
-msgstr ""
+msgstr "運動場"
 
 #. item
@@ -14760,15 +15032,15 @@
 #: build/trans_presets.java:1773
 msgid "Edit Playground"
-msgstr ""
+msgstr "編輯運動場"
 
 #. item "Leisure/Playground" text "Name"
 #: build/trans_presets.java:1777
 msgid "Fishing"
-msgstr ""
+msgstr "釣魚"
 
 #. item
 #: build/trans_presets.java:1778
 msgid "Edit Fishing"
-msgstr ""
+msgstr "編輯釣魚場"
 
 #. item "Leisure/Fishing" text "Name"
@@ -14776,15 +15048,15 @@
 #: build/trans_presets.java:1784
 msgid "Sport Facilities"
-msgstr ""
+msgstr "運動設施"
 
 #. group "Sport Facilities"
 #: build/trans_presets.java:1785
 msgid "Stadium"
-msgstr ""
+msgstr "競技場"
 
 #. item
 #: build/trans_presets.java:1786
 msgid "Edit Stadium"
-msgstr ""
+msgstr "編輯競技揚"
 
 #. item "Sport Facilities/Stadium" text "Name"
@@ -14799,5 +15071,5 @@
 #: build/trans_presets.java:1808 build/trans_presets.java:1817
 msgid "select sport:"
-msgstr ""
+msgstr "選擇運動："
 
 #. item "Sport Facilities/Stadium" label "select sport:"
@@ -15173,29 +15445,29 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 build/trans_style.java:3705
-#: build/trans_style.java:3713 build/trans_style.java:3721
-#: build/trans_style.java:3729 build/trans_style.java:3737
-#: build/trans_style.java:3745 build/trans_style.java:3753
-#: build/trans_style.java:3761 build/trans_style.java:3769
-#: build/trans_style.java:3777 build/trans_style.java:3785
-#: build/trans_style.java:3793 build/trans_style.java:3801
-#: build/trans_style.java:3809 build/trans_style.java:3817
-#: build/trans_style.java:3825 build/trans_style.java:3833
-#: build/trans_style.java:3841 build/trans_style.java:3849
-#: build/trans_style.java:3857
+#: build/trans_style.java:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
-msgstr ""
+msgstr "運動"
 
 #. item "Sport Facilities/Stadium" combo "sport"
@@ -15206,30 +15478,30 @@
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "multi"
-msgstr ""
+msgstr "多種"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "archery"
-msgstr ""
+msgstr "射箭"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "athletics"
-msgstr ""
+msgstr "田徑"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "australian_football"
-msgstr ""
+msgstr "澳洲足球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "baseball"
-msgstr ""
+msgstr "棒球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "basketball"
-msgstr ""
+msgstr "籃球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
@@ -15241,15 +15513,15 @@
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "bowls"
-msgstr ""
+msgstr "保齡球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "canoe"
-msgstr ""
+msgstr "獨木舟"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "climbing"
-msgstr ""
+msgstr "攀岩"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
@@ -15266,50 +15538,50 @@
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "croquet"
-msgstr ""
+msgstr "木球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "cycling"
-msgstr ""
+msgstr "自行車"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "dog_racing"
-msgstr ""
+msgstr "賽狗"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "equestrian"
-msgstr ""
+msgstr "馬術"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "football"
-msgstr ""
+msgstr "美式足球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "golf"
-msgstr ""
+msgstr "高爾夫"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "gymnastics"
-msgstr ""
+msgstr "體操"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "hockey"
-msgstr ""
+msgstr "曲棍球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "horse_racing"
-msgstr ""
+msgstr "賽馬"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "motor"
-msgstr ""
+msgstr "摩托車"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
@@ -15326,10 +15598,10 @@
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "rugby"
-msgstr ""
+msgstr "橄欖球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "shooting"
-msgstr ""
+msgstr "射擊"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
@@ -15346,34 +15618,34 @@
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "skiing"
-msgstr ""
+msgstr "滑雪"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "soccer"
-msgstr ""
+msgstr "足球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "swimming"
-msgstr ""
+msgstr "游泳"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "table_tennis"
-msgstr ""
+msgstr "桌球"
 
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
 msgid "tennis"
-msgstr ""
+msgstr "網球"
 
 #: build/trans_presets.java:1794
 msgid "Sports Centre"
-msgstr ""
+msgstr "運動中心"
 
 #. item
 #: build/trans_presets.java:1795
 msgid "Edit Sports Centre"
-msgstr ""
+msgstr "編輯運動中心"
 
 #: build/trans_presets.java:1803
@@ -15388,44 +15660,44 @@
 #: build/trans_presets.java:1812
 msgid "Racetrack"
-msgstr ""
+msgstr "跑道"
 
 #. item
 #: build/trans_presets.java:1813
 msgid "Edit Racetrack"
-msgstr ""
+msgstr "編輯跑道"
 
 #: build/trans_presets.java:1821
 msgid "Golf Course"
-msgstr ""
+msgstr "高爾夫路線"
 
 #. item
 #: build/trans_presets.java:1822
 msgid "Edit Golf Course"
-msgstr ""
+msgstr "編輯高爾夫路線"
 
 #. item "Sport Facilities/Golf Course" text "Name"
 #: build/trans_presets.java:1826
 msgid "Miniature Golf"
-msgstr ""
+msgstr "迷你高爾夫"
 
 #. item
 #: build/trans_presets.java:1827
 msgid "Edit Miniature Golf"
-msgstr ""
+msgstr "編輯迷你高爾夫"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
 #: build/trans_presets.java:1832
 msgid "Sport"
-msgstr ""
+msgstr "運動"
 
 #. group "Sport"
 #: build/trans_presets.java:1833
 msgid "Multi"
-msgstr ""
+msgstr "多種"
 
 #. item
 #: build/trans_presets.java:1834
 msgid "Edit Multi"
-msgstr ""
+msgstr "編輯多種"
 
 #. item "Sport/Multi" combo "type"
@@ -15500,5 +15772,5 @@
 #: build/trans_presets.java:2035 build/trans_presets.java:2041
 msgid "sports_centre"
-msgstr ""
+msgstr "運動中心"
 
 #: build/trans_presets.java:1837 build/trans_presets.java:1843
@@ -15520,5 +15792,5 @@
 #: build/trans_presets.java:2035 build/trans_presets.java:2041
 msgid "stadium"
-msgstr ""
+msgstr "競技揚"
 
 #: build/trans_presets.java:1839
@@ -15533,100 +15805,100 @@
 #: build/trans_presets.java:1845
 msgid "Athletics"
-msgstr ""
+msgstr "田徑"
 
 #. item
 #: build/trans_presets.java:1846
 msgid "Edit Athletics"
-msgstr ""
+msgstr "編輯田徑"
 
 #: build/trans_presets.java:1851
 msgid "Archery"
-msgstr ""
+msgstr "射箭"
 
 #. item
 #: build/trans_presets.java:1852
 msgid "Edit Archery"
-msgstr ""
+msgstr "編輯射箭"
 
 #: build/trans_presets.java:1857
 msgid "Climbing"
-msgstr ""
+msgstr "攀岩"
 
 #. item
 #: build/trans_presets.java:1858
 msgid "Edit Climbing"
-msgstr ""
+msgstr "編輯攀岩"
 
 #: build/trans_presets.java:1863
 msgid "Canoeing"
-msgstr ""
+msgstr "獨木舟"
 
 #. item
 #: build/trans_presets.java:1864
 msgid "Edit Canoeing"
-msgstr ""
+msgstr "編輯獨木舟"
 
 #: build/trans_presets.java:1869
 msgid "Cycling"
-msgstr ""
+msgstr "自行車"
 
 #. item
 #: build/trans_presets.java:1870
 msgid "Edit Cycling"
-msgstr ""
+msgstr "編輯自行車"
 
 #: build/trans_presets.java:1875
 msgid "Dog Racing"
-msgstr ""
+msgstr "賽狗"
 
 #. item
 #: build/trans_presets.java:1876
 msgid "Edit Dog Racing"
-msgstr ""
+msgstr "編輯賽狗"
 
 #: build/trans_presets.java:1881
 msgid "Equestrian"
-msgstr ""
+msgstr "馬術"
 
 #. item
 #: build/trans_presets.java:1882
 msgid "Edit Equestrian"
-msgstr ""
+msgstr "編輯馬術"
 
 #: build/trans_presets.java:1887
 msgid "Horse Racing"
-msgstr ""
+msgstr "賽馬"
 
 #. item
 #: build/trans_presets.java:1888
 msgid "Edit Horse Racing"
-msgstr ""
+msgstr "編輯賽馬"
 
 #: build/trans_presets.java:1893
 msgid "Gymnastics"
-msgstr ""
+msgstr "體操"
 
 #. item
 #: build/trans_presets.java:1894
 msgid "Edit Gymnastics"
-msgstr ""
+msgstr "編輯體操"
 
 #: build/trans_presets.java:1899
 msgid "Motor Sports"
-msgstr ""
+msgstr "摩托車運動"
 
 #. item
 #: build/trans_presets.java:1900
 msgid "Edit Motor Sports"
-msgstr ""
+msgstr "編輯摩托車運動"
 
 #: build/trans_presets.java:1905
 msgid "Skating"
-msgstr ""
+msgstr "溜冰"
 
 #. item
 #: build/trans_presets.java:1906
 msgid "Edit Skating"
-msgstr ""
+msgstr "編輯溜冰"
 
 #: build/trans_presets.java:1911
@@ -15641,14 +15913,14 @@
 #: build/trans_presets.java:1917
 msgid "Swimming"
-msgstr ""
+msgstr "游泳"
 
 #. item
 #: build/trans_presets.java:1918
 msgid "Edit Swimming"
-msgstr ""
+msgstr "編輯游泳"
 
 #: build/trans_presets.java:1923
 msgid "Skiing"
-msgstr ""
+msgstr "滑雪"
 
 #. item
@@ -15656,5 +15928,5 @@
 #: build/trans_presets.java:1925
 msgid "Edit Skiing"
-msgstr ""
+msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" text "Name"
@@ -15678,10 +15950,10 @@
 #: build/trans_presets.java:1929
 msgid "Difficulty"
-msgstr ""
+msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty"
 #: build/trans_presets.java:1929
 msgid "novice"
-msgstr ""
+msgstr "新手"
 
 #: build/trans_presets.java:1929
@@ -15691,5 +15963,5 @@
 #: build/trans_presets.java:1929
 msgid "intermediate"
-msgstr ""
+msgstr "中級"
 
 #: build/trans_presets.java:1929
@@ -15699,5 +15971,5 @@
 #: build/trans_presets.java:1929
 msgid "expert"
-msgstr ""
+msgstr "專家"
 
 #: build/trans_presets.java:1929
@@ -15707,5 +15979,5 @@
 #: build/trans_presets.java:1932
 msgid "Shooting"
-msgstr ""
+msgstr "射擊"
 
 #. item
@@ -15713,69 +15985,69 @@
 #: build/trans_presets.java:1934
 msgid "Edit Shooting"
-msgstr ""
+msgstr "編輯射擊"
 
 #: build/trans_presets.java:1940
 msgid "Sport (Ball)"
-msgstr ""
+msgstr "運動（球類）"
 
 #. group "Sport (Ball)"
 #: build/trans_presets.java:1941
 msgid "Soccer"
-msgstr ""
+msgstr "足球"
 
 #. item
 #: build/trans_presets.java:1942
 msgid "Edit Soccer"
-msgstr ""
+msgstr "編輯足球"
 
 #: build/trans_presets.java:1947
 msgid "Football"
-msgstr ""
+msgstr "美式足球"
 
 #. item
 #: build/trans_presets.java:1948
 msgid "Edit Football"
-msgstr ""
+msgstr "編輯美式足球"
 
 #: build/trans_presets.java:1953
 msgid "Australian Football"
-msgstr ""
+msgstr "澳洲足球"
 
 #. item
 #: build/trans_presets.java:1954
 msgid "Edit Australian Football"
-msgstr ""
+msgstr "編輯澳洲足球"
 
 #: build/trans_presets.java:1959
 msgid "Baseball"
-msgstr ""
+msgstr "棒球"
 
 #. item
 #: build/trans_presets.java:1960
 msgid "Edit Baseball"
-msgstr ""
+msgstr "編輯棒球"
 
 #: build/trans_presets.java:1965
 msgid "Basketball"
-msgstr ""
+msgstr "籃球"
 
 #. item
 #: build/trans_presets.java:1966
 msgid "Edit Basketball"
-msgstr ""
+msgstr "編輯籃球"
 
 #: build/trans_presets.java:1971
 msgid "Golf"
-msgstr ""
+msgstr "高爾夫"
 
 #. item
 #: build/trans_presets.java:1972
 msgid "Edit Golf"
-msgstr ""
+msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
 #: build/trans_presets.java:1975
 msgid "golf_course"
-msgstr ""
+msgstr "高爾夫路線"
 
 #: build/trans_presets.java:1977
@@ -15790,10 +16062,10 @@
 #: build/trans_presets.java:1983
 msgid "Bowls"
-msgstr ""
+msgstr "保齡球"
 
 #. item
 #: build/trans_presets.java:1984
 msgid "Edit Bowls"
-msgstr ""
+msgstr "編輯保齡球"
 
 #: build/trans_presets.java:1989
@@ -15817,28 +16089,28 @@
 #: build/trans_presets.java:2001
 msgid "Croquet"
-msgstr ""
+msgstr "木球"
 
 #. item
 #: build/trans_presets.java:2002
 msgid "Edit Croquet"
-msgstr ""
+msgstr "編輯木球"
 
 #: build/trans_presets.java:2007
 msgid "Hockey"
-msgstr ""
+msgstr "曲棍球"
 
 #. item
 #: build/trans_presets.java:2008
 msgid "Edit Hockey"
-msgstr ""
+msgstr "編曲棍球"
 
 #: build/trans_presets.java:2013
 msgid "Pelota"
-msgstr ""
+msgstr "回力球"
 
 #. item
 #: build/trans_presets.java:2014
 msgid "Edit Pelota"
-msgstr ""
+msgstr "編輯回力球"
 
 #: build/trans_presets.java:2019
@@ -15853,38 +16125,38 @@
 #: build/trans_presets.java:2025
 msgid "Rugby"
-msgstr ""
+msgstr "橄欖球"
 
 #. item
 #: build/trans_presets.java:2026
 msgid "Edit Rugby"
-msgstr ""
+msgstr "編輯橄欖球"
 
 #: build/trans_presets.java:2031
 msgid "Table Tennis"
-msgstr ""
+msgstr "桌球"
 
 #. item
 #: build/trans_presets.java:2032
 msgid "Edit Table Tennis"
-msgstr ""
+msgstr "編輯桌球"
 
 #: build/trans_presets.java:2037
 msgid "Tennis"
-msgstr ""
+msgstr "網球"
 
 #. item
 #: build/trans_presets.java:2038
 msgid "Edit Tennis"
-msgstr ""
+msgstr "編輯網路"
 
 #. <separator/>
 #: build/trans_presets.java:2045
 msgid "Buildings"
-msgstr ""
+msgstr "建築物"
 
 #. group "Buildings"
 #: build/trans_presets.java:2046
 msgid "Building"
-msgstr ""
+msgstr "建築物"
 
 #. item
@@ -15892,5 +16164,5 @@
 #: build/trans_presets.java:2049
 msgid "Public Building"
-msgstr ""
+msgstr "公共建築"
 
 #. item
@@ -15898,10 +16170,10 @@
 #: build/trans_presets.java:2051
 msgid "Edit Public Building"
-msgstr ""
+msgstr "編輯公共建築"
 
 #. item "Buildings/Public Building" text "Name"
 #: build/trans_presets.java:2055
 msgid "Town hall"
-msgstr ""
+msgstr "縣市政府/公所"
 
 #. item
@@ -15909,10 +16181,10 @@
 #: build/trans_presets.java:2057
 msgid "Edit Town hall"
-msgstr ""
+msgstr "編輯縣市政府/公所"
 
 #. item "Buildings/Town hall" text "Name"
 #: build/trans_presets.java:2061
 msgid "Embassy"
-msgstr ""
+msgstr "大使館"
 
 #. item
@@ -15920,10 +16192,10 @@
 #: build/trans_presets.java:2063
 msgid "Edit Embassy"
-msgstr ""
+msgstr "編輯大使館"
 
 #. item "Buildings/Embassy" text "Name"
 #: build/trans_presets.java:2067
 msgid "Courthouse"
-msgstr ""
+msgstr "法院"
 
 #. item
@@ -15932,10 +16204,10 @@
 #: build/trans_presets.java:2070
 msgid "Edit Courthouse"
-msgstr ""
+msgstr "編輯法院"
 
 #. item "Buildings/Courthouse" text "Name"
 #: build/trans_presets.java:2074
 msgid "Prison"
-msgstr ""
+msgstr "監獄"
 
 #. item
@@ -15944,10 +16216,10 @@
 #: build/trans_presets.java:2077
 msgid "Edit Prison"
-msgstr ""
+msgstr "編輯監獄"
 
 #. item "Buildings/Prison" text "Name"
 #: build/trans_presets.java:2081
 msgid "Police"
-msgstr ""
+msgstr "警察局"
 
 #. item
@@ -15957,10 +16229,10 @@
 #: build/trans_presets.java:2085
 msgid "Edit Police"
-msgstr ""
+msgstr "編輯警察局"
 
 #. item "Buildings/Police" text "Name"
 #: build/trans_presets.java:2089
 msgid "Fire Station"
-msgstr ""
+msgstr "消防隊"
 
 #. item
@@ -15969,10 +16241,10 @@
 #: build/trans_presets.java:2092
 msgid "Edit Fire Station"
-msgstr ""
+msgstr "編輯消防隊"
 
 #. item "Buildings/Fire Station" text "Name"
 #: build/trans_presets.java:2096
 msgid "Post Office"
-msgstr ""
+msgstr "郵局"
 
 #. item
@@ -15980,5 +16252,5 @@
 #: build/trans_presets.java:2098
 msgid "Edit Post Office"
-msgstr ""
+msgstr "編輯郵局"
 
 #. item "Buildings/Post Office" text "Name"
@@ -15986,15 +16258,15 @@
 #: build/trans_presets.java:2103
 msgid "Kindergarten"
-msgstr ""
+msgstr "幼稚園"
 
 #. item
 #: build/trans_presets.java:2104
 msgid "Edit Kindergarten"
-msgstr ""
+msgstr "編輯幼稚園"
 
 #. item "Buildings/Kindergarten" text "Name"
 #: build/trans_presets.java:2108
 msgid "School"
-msgstr ""
+msgstr "學校"
 
 #. item
@@ -16002,10 +16274,10 @@
 #: build/trans_presets.java:2110
 msgid "Edit School"
-msgstr ""
+msgstr "編輯學校"
 
 #. item "Buildings/School" text "Name"
 #: build/trans_presets.java:2114
 msgid "University"
-msgstr ""
+msgstr "大學"
 
 #. item
@@ -16013,10 +16285,10 @@
 #: build/trans_presets.java:2116
 msgid "Edit University"
-msgstr ""
+msgstr "編輯大學"
 
 #. item "Buildings/University" text "Name"
 #: build/trans_presets.java:2120
 msgid "College"
-msgstr ""
+msgstr "學院"
 
 #. item
@@ -16024,5 +16296,5 @@
 #: build/trans_presets.java:2122
 msgid "Edit College"
-msgstr ""
+msgstr "編輯學院"
 
 #. item "Buildings/College" text "Name"
@@ -16030,5 +16302,5 @@
 #: build/trans_presets.java:2127
 msgid "Cinema"
-msgstr ""
+msgstr "電影院"
 
 #. item
@@ -16037,10 +16309,10 @@
 #: build/trans_presets.java:2130
 msgid "Edit Cinema"
-msgstr ""
+msgstr "編輯電影院"
 
 #. item "Buildings/Cinema" text "Name"
 #: build/trans_presets.java:2134
 msgid "Library"
-msgstr ""
+msgstr "圖書館"
 
 #. item
@@ -16049,10 +16321,10 @@
 #: build/trans_presets.java:2137
 msgid "Edit Library"
-msgstr ""
+msgstr "編輯圖書館"
 
 #. item "Buildings/Library" text "Name"
 #: build/trans_presets.java:2141
 msgid "Arts Centre"
-msgstr ""
+msgstr "美術館"
 
 #. item
@@ -16060,10 +16332,10 @@
 #: build/trans_presets.java:2143
 msgid "Edit Arts Centre"
-msgstr ""
+msgstr "編輯美術館"
 
 #. item "Buildings/Arts Centre" text "Name"
 #: build/trans_presets.java:2147
 msgid "Theatre"
-msgstr ""
+msgstr "劇院"
 
 #. item
@@ -16072,10 +16344,10 @@
 #: build/trans_presets.java:2150
 msgid "Edit Theatre"
-msgstr ""
+msgstr "編輯劇院"
 
 #. item "Buildings/Theatre" text "Name"
 #: build/trans_presets.java:2154
 msgid "Place of Worship"
-msgstr ""
+msgstr "宗教儀式場所"
 
 #. item
@@ -16085,5 +16357,5 @@
 #: build/trans_presets.java:2158
 msgid "Edit Place of Worship"
-msgstr ""
+msgstr "編輯宗教儀式場所"
 
 #. item "Buildings/Place of Worship" text "Name"
@@ -16093,5 +16365,5 @@
 #: build/trans_presets.java:2891
 msgid "Religion"
-msgstr ""
+msgstr "宗教"
 
 #. item "Buildings/Place of Worship" combo "Religion"
@@ -16101,40 +16373,40 @@
 #: build/trans_presets.java:2891
 msgid "bahai"
-msgstr ""
+msgstr "巴海大同教"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
 msgid "buddhist"
-msgstr ""
+msgstr "佛教"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
 msgid "christian"
-msgstr ""
+msgstr "基督教系"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
 msgid "hindu"
-msgstr ""
+msgstr "印度教"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
 msgid "jain"
-msgstr ""
+msgstr "耆那教"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
 msgid "jewish"
-msgstr ""
+msgstr "猶太教"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
 msgid "muslim"
-msgstr ""
+msgstr "回教"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
 #: build/trans_presets.java:2891
 msgid "sikh"
-msgstr ""
+msgstr "錫克教"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
@@ -16146,5 +16418,5 @@
 #: build/trans_presets.java:2891
 msgid "taoist"
-msgstr ""
+msgstr "道教"
 
 #: build/trans_presets.java:2161 build/trans_presets.java:2882
@@ -16156,10 +16428,10 @@
 #: build/trans_presets.java:2891
 msgid "zoroastrian"
-msgstr ""
+msgstr "祆教"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "Denomination"
-msgstr ""
+msgstr "教派"
 
 #. item "Buildings/Place of Worship" combo "Denomination"
@@ -16169,20 +16441,20 @@
 #: build/trans_presets.java:2892
 msgid "anglican"
-msgstr ""
+msgstr "英國國教"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "baptist"
-msgstr ""
+msgstr "浸信會"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "catholic"
-msgstr ""
+msgstr "天主教"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "evangelical"
-msgstr ""
+msgstr "福音派教會"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
@@ -16194,50 +16466,50 @@
 #: build/trans_presets.java:2892
 msgid "lutheran"
-msgstr ""
+msgstr "路德教派"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "methodist"
-msgstr ""
+msgstr "衛理公會教"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "mormon"
-msgstr ""
+msgstr "摩門教"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "orthodox"
-msgstr ""
+msgstr "東正教"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "pentecostal"
-msgstr ""
+msgstr "聖靈降臨教派"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "presbyterian"
-msgstr ""
+msgstr "長老派教會"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "protestant"
-msgstr ""
+msgstr "新教"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "quaker"
-msgstr ""
+msgstr "教友派"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "shia"
-msgstr ""
+msgstr "什葉派"
 
 #: build/trans_presets.java:2162 build/trans_presets.java:2883
 #: build/trans_presets.java:2892
 msgid "sunni"
-msgstr ""
+msgstr "遜尼派"
 
 #. <separator/>
@@ -16268,15 +16540,15 @@
 #: build/trans_presets.java:2174
 msgid "City name"
-msgstr ""
+msgstr "城市名稱"
 
 #. item "Buildings/Addresses" text "City name"
 #: build/trans_presets.java:2175
 msgid "Post code"
-msgstr ""
+msgstr "郵遞區號"
 
 #. item "Buildings/Addresses" text "Post code"
 #: build/trans_presets.java:2176
 msgid "Country code"
-msgstr ""
+msgstr "國碼"
 
 #. item "Buildings/Addresses" text "Country code"
@@ -16297,5 +16569,5 @@
 #: build/trans_presets.java:2184
 msgid "Numbering scheme"
-msgstr ""
+msgstr "編號規則"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
@@ -16314,54 +16586,54 @@
 #: build/trans_presets.java:2184
 msgid "alphabetic"
-msgstr ""
+msgstr "按字母順序"
 
 #: build/trans_presets.java:2187
 msgid "Man Made"
-msgstr ""
+msgstr "人造物"
 
 #. group "Man Made"
 #: build/trans_presets.java:2188
 msgid "Works"
-msgstr ""
+msgstr "作品"
 
 #. item
 #: build/trans_presets.java:2189
 msgid "Edit Works"
-msgstr ""
+msgstr "編輯作品"
 
 #. item "Man Made/Works" text "Name"
 #: build/trans_presets.java:2193
 msgid "Tower"
-msgstr ""
+msgstr "塔"
 
 #. item
 #: build/trans_presets.java:2194
 msgid "Edit Tower"
-msgstr ""
+msgstr "編輯塔"
 
 #. item "Man Made/Tower" text "Name"
 #: build/trans_presets.java:2198
 msgid "Water Tower"
-msgstr ""
+msgstr "貯水塔"
 
 #. item
 #: build/trans_presets.java:2199
 msgid "Edit Water Tower"
-msgstr ""
+msgstr "編輯貯水塔"
 
 #. item "Man Made/Water Tower" text "Name"
 #: build/trans_presets.java:2203
 msgid "Gasometer"
-msgstr ""
+msgstr "貯氣桶"
 
 #. item
 #: build/trans_presets.java:2204
 msgid "Edit Gasometer"
-msgstr ""
+msgstr "編輯貯氣桶"
 
 #. item "Man Made/Gasometer" text "Name"
 #: build/trans_presets.java:2208
 msgid "Lighthouse"
-msgstr ""
+msgstr "燈塔"
 
 #. item
@@ -16369,10 +16641,10 @@
 #: build/trans_presets.java:2210
 msgid "Edit Lighthouse"
-msgstr ""
+msgstr "編輯燈塔"
 
 #. item "Man Made/Lighthouse" text "Name"
 #: build/trans_presets.java:2214
 msgid "Windmill"
-msgstr ""
+msgstr "風車"
 
 #. item
@@ -16380,10 +16652,10 @@
 #: build/trans_presets.java:2216
 msgid "Edit Windmill"
-msgstr ""
+msgstr "編輯風車"
 
 #. item "Man Made/Windmill" text "Name"
 #: build/trans_presets.java:2220
 msgid "Pipeline"
-msgstr ""
+msgstr "油管"
 
 #. item
@@ -16391,10 +16663,10 @@
 #: build/trans_presets.java:2222
 msgid "Edit Pipeline"
-msgstr ""
+msgstr "編輯油管"
 
 #. item "Man Made/Pipeline" text "Name"
 #: build/trans_presets.java:2226
 msgid "Wastewater Plant"
-msgstr ""
+msgstr "汙水處理廠"
 
 #. item
@@ -16404,10 +16676,10 @@
 #: build/trans_presets.java:2230
 msgid "Edit Wastewater Plant"
-msgstr ""
+msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Wastewater Plant" text "Name"
 #: build/trans_presets.java:2234
 msgid "Crane"
-msgstr ""
+msgstr "起重機"
 
 #. item
@@ -16415,5 +16687,5 @@
 #: build/trans_presets.java:2236
 msgid "Edit Crane"
-msgstr ""
+msgstr "編輯起重機"
 
 #. item "Man Made/Crane" text "Name"
@@ -16431,5 +16703,5 @@
 #: build/trans_presets.java:2246
 msgid "Survey Point"
-msgstr ""
+msgstr "測量點"
 
 #. item
@@ -16437,10 +16709,10 @@
 #: build/trans_presets.java:2248
 msgid "Edit Survey Point"
-msgstr ""
+msgstr "編輯測量點"
 
 #. item "Man Made/Survey Point" text "Name"
 #: build/trans_presets.java:2252
 msgid "Surveillance"
-msgstr ""
+msgstr "監視"
 
 #. item
@@ -16448,5 +16720,5 @@
 #: build/trans_presets.java:2254
 msgid "Edit Surveillance Camera"
-msgstr ""
+msgstr "編輯監視攝影機"
 
 #. item "Man Made/Surveillance" text "Name"
@@ -16454,5 +16726,5 @@
 #: build/trans_presets.java:2259
 msgid "Power Generator"
-msgstr ""
+msgstr "發電廠"
 
 #. item
@@ -16462,34 +16734,34 @@
 #: build/trans_presets.java:2263
 msgid "Edit Power Generator"
-msgstr ""
+msgstr "編輯發電廠"
 
 #. item "Man Made/Power Generator" combo "Type"
 #: build/trans_presets.java:2265
 msgid "wind"
-msgstr ""
+msgstr "風力"
 
 #: build/trans_presets.java:2265
 msgid "hydro"
-msgstr ""
+msgstr "水力"
 
 #: build/trans_presets.java:2265
 msgid "fossil"
-msgstr ""
+msgstr "燃油"
 
 #: build/trans_presets.java:2265
 msgid "nuclear"
-msgstr ""
+msgstr "核能"
 
 #: build/trans_presets.java:2265
 msgid "coal"
-msgstr ""
+msgstr "燃媒"
 
 #: build/trans_presets.java:2265
 msgid "photovoltaic"
-msgstr ""
+msgstr "光電"
 
 #: build/trans_presets.java:2265
 msgid "gas"
-msgstr ""
+msgstr "天然氣"
 
 #. item "Man Made/Power Generator" text "Name"
@@ -16526,5 +16798,5 @@
 #: build/trans_presets.java:2283
 msgid "Power Tower"
-msgstr ""
+msgstr "電塔"
 
 #. item
@@ -16535,5 +16807,5 @@
 #: build/trans_presets.java:2288
 msgid "Edit Power Tower"
-msgstr ""
+msgstr "編輯電塔"
 
 #. item "Man Made/Power Tower" label "Edit Power Tower"
@@ -16541,5 +16813,5 @@
 #: build/trans_presets.java:2291
 msgid "Power Line"
-msgstr ""
+msgstr "電線"
 
 #. item
@@ -16548,15 +16820,15 @@
 #: build/trans_presets.java:2294
 msgid "Edit Power Line"
-msgstr ""
+msgstr "編輯電線"
 
 #. item "Man Made/Power Line" text "Line reference"
 #: build/trans_presets.java:2298
 msgid "Voltage"
-msgstr ""
+msgstr "電壓"
 
 #. item "Man Made/Power Line" text "Voltage"
 #: build/trans_presets.java:2299
 msgid "Amount of Wires"
-msgstr ""
+msgstr "線數"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
@@ -16568,5 +16840,5 @@
 #: build/trans_presets.java:2303
 msgid "Toilets"
-msgstr ""
+msgstr "廁所"
 
 #. item "Amenities/Toilets" text "Operator"
@@ -16584,10 +16856,10 @@
 #: build/trans_presets.java:2312
 msgid "Post Box"
-msgstr ""
+msgstr "郵筒"
 
 #. item "Amenities/Post Box" text "Operator"
 #: build/trans_presets.java:2317
 msgid "Telephone"
-msgstr ""
+msgstr "電話"
 
 #. item
@@ -16596,5 +16868,5 @@
 #: build/trans_presets.java:2320
 msgid "Edit Telephone"
-msgstr ""
+msgstr "編輯電話"
 
 #. item "Amenities/Telephone" text "Operator"
@@ -16602,5 +16874,5 @@
 #: build/trans_presets.java:2323 build/trans_presets.java:2402
 msgid "Coins"
-msgstr ""
+msgstr "硬幣"
 
 #. item "Amenities/Telephone" check "Coins"
@@ -16614,5 +16886,5 @@
 #: build/trans_presets.java:2325 build/trans_presets.java:2404
 msgid "Electronic purses and Charge cards"
-msgstr ""
+msgstr "電子錢包或收費卡"
 
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
@@ -16626,15 +16898,15 @@
 #: build/trans_presets.java:2327 build/trans_presets.java:2406
 msgid "Credit cards"
-msgstr ""
+msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
 #: build/trans_presets.java:2328
 msgid "Telephone cards"
-msgstr ""
+msgstr "電話卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
 #: build/trans_presets.java:2330
 msgid "Recycling"
-msgstr ""
+msgstr "資源回收"
 
 #. item
@@ -16643,5 +16915,5 @@
 #: build/trans_presets.java:2333
 msgid "Edit Recycling station"
-msgstr ""
+msgstr "資源回收站"
 
 #. item "Amenities/Recycling" label "Edit Recycling station"
@@ -16649,30 +16921,30 @@
 #: build/trans_presets.java:2335
 msgid "Batteries"
-msgstr ""
+msgstr "電池"
 
 #. item "Amenities/Recycling" check "Batteries"
 #: build/trans_presets.java:2336
 msgid "Cans"
-msgstr ""
+msgstr "瓶罐"
 
 #. item "Amenities/Recycling" check "Cans"
 #: build/trans_presets.java:2337
 msgid "Clothes"
-msgstr ""
+msgstr "衣服"
 
 #. item "Amenities/Recycling" check "Clothes"
 #: build/trans_presets.java:2338
 msgid "Glass"
-msgstr ""
+msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
 #: build/trans_presets.java:2339
 msgid "Paper"
-msgstr ""
+msgstr "紙張"
 
 #. item "Amenities/Recycling" check "Paper"
 #: build/trans_presets.java:2340
 msgid "Scrap Metal"
-msgstr ""
+msgstr "廢金屬"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
@@ -18031,8 +18303,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "單車"
@@ -18101,8 +18373,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr ""
@@ -18128,5 +18400,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr ""
@@ -18141,5 +18413,5 @@
 #: build/trans_presets.java:3000
 msgid "Network"
-msgstr ""
+msgstr "網路"
 
 #. item "Relations/Route" combo "State"
@@ -18256,4 +18528,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18262,4 +18535,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18268,4 +18542,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18274,4 +18549,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18335,7 +18611,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr ""
@@ -18393,4 +18669,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18516,7 +18793,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18599,15 +18876,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr ""
@@ -18649,5 +18926,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr ""
@@ -18857,11 +19134,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -18899,6 +19176,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr ""
@@ -18954,7 +19231,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr ""
@@ -19010,8 +19287,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr ""
@@ -19032,5 +19309,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19044,5 +19321,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19063,5 +19340,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr ""
@@ -19076,5 +19353,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19089,5 +19366,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr ""
@@ -19101,5 +19378,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr ""
@@ -19113,5 +19390,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr ""
@@ -19139,5 +19416,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr ""
@@ -19305,13 +19582,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr ""
@@ -19373,7 +19650,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19396,10 +19673,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19419,7 +19696,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19427,8 +19707,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr ""
@@ -19473,6 +19757,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr ""
@@ -19486,5 +19770,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr ""
@@ -19506,5 +19790,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr ""
@@ -19518,5 +19802,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr ""
@@ -19564,7 +19848,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr ""
@@ -19581,5 +19865,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr ""
@@ -19594,5 +19878,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr ""
@@ -19607,5 +19891,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr ""
@@ -19620,5 +19904,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr ""
@@ -19633,5 +19917,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr ""
@@ -19646,5 +19930,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr ""
@@ -19749,10 +20033,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr ""
@@ -19766,5 +20050,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr ""
@@ -19778,5 +20062,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr ""
@@ -19904,12 +20188,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742
+#: build/trans_style.java:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr ""
@@ -19923,5 +20207,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr ""
@@ -19993,8 +20277,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr ""
@@ -20096,10 +20380,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr ""
@@ -20485,22 +20769,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr ""
@@ -20532,6 +20816,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr ""
@@ -20592,8 +20876,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr ""
@@ -20946,26 +21230,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: build/trans_style.java:2438 build/trans_style.java:2446
-#: build/trans_style.java:2454 build/trans_style.java:2462
-#: build/trans_style.java:2470 build/trans_style.java:2478
-#: build/trans_style.java:2486 build/trans_style.java:2494
-#: build/trans_style.java:2502 build/trans_style.java:2510
-#: build/trans_style.java:2518 build/trans_style.java:2526
-#: build/trans_style.java:2534 build/trans_style.java:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr ""
@@ -21037,8 +21321,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
+#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr ""
@@ -21188,9 +21472,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr ""
@@ -21262,8 +21546,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr ""
@@ -21334,8 +21618,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr ""
@@ -21349,5 +21633,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr ""
@@ -21361,5 +21645,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr ""
@@ -21381,5 +21665,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr ""
@@ -21393,5 +21677,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr ""
@@ -21405,5 +21689,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr ""
@@ -21426,5 +21710,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr ""
@@ -21438,5 +21722,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr ""
@@ -21450,5 +21734,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr ""
@@ -21462,5 +21746,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr ""
@@ -21474,5 +21758,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr ""
@@ -21529,7 +21813,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr ""
@@ -21543,5 +21827,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr ""
@@ -21554,5 +21838,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr ""
@@ -21567,5 +21851,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr ""
@@ -21579,5 +21863,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr ""
@@ -21632,8 +21916,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr ""
@@ -21647,5 +21931,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr ""
@@ -21659,5 +21943,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr ""
@@ -21671,5 +21955,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr ""
@@ -21683,5 +21967,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr ""
@@ -21695,5 +21979,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr ""
@@ -21771,8 +22055,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr ""
@@ -21820,7 +22104,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr ""
@@ -21962,10 +22246,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
 msgid "place"
 msgstr ""
@@ -22013,6 +22297,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr ""
@@ -22068,5 +22352,5 @@
 #: build/trans_surveyor.java:52
 msgid "Shopping"
-msgstr ""
+msgstr "購物"
 
 #. <button label="Shopping" hotkey="S" icon="shopping">
@@ -22243,10 +22527,10 @@
 msgstr ""
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "開啟航空圖"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22254,5 +22538,5 @@
 msgstr ""
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22260,72 +22544,133 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap 資料"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "YAHOO (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "自行車道"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "YAHOO (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr ""
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "資料圖層"
+
+#~ msgid "Change"
+#~ msgstr "改變"
+
+#~ msgid "Rotate"
+#~ msgstr "旋轉"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr "請選擇至少一個節點、路徑或關係。只有已上傳的元件會有歷史紀錄。"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "取消刪除路徑..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "檢查節點 {0} 是否消失..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "取消刪除關係..."
-
-#~ msgid "Keep mine"
-#~ msgstr "保留我的"
-
-#~ msgid "Delete mine"
-#~ msgstr "刪除我的"
-
-#~ msgid "Selection too big"
-#~ msgstr "選擇區域太大"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "路徑為 {0} 的圖片不存在或無法讀取。"
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 46.1° and 57° only.\n"
+#~ "Use another projection system if you are not using\n"
+#~ "a French WMS server.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "投影法「{0}」只設計用於\n"
+#~ "緯度 46.1° 到 57° 之間。\n"
+#~ "如果您不是使用法國 WMS 伺服器，\n"
+#~ "請使用別種投影系統。\n"
+#~ "看到此訊息後請勿上傳任何資料。"
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "投影法「{0}」只設計用於\n"
+#~ "緯度 45.7° 到 47.9° 和\n"
+#~ "經度 5.7° 到 10.6° 之間。\n"
+#~ "如果您不是在製作瑞士或列支敦斯登的資料，\n"
+#~ "請使用別種投影系統。\n"
+#~ "看到此訊息後請勿上傳任何資料。"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "衝突： {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "標籤預設組合來源"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 http://josm."
+#~ "openstreetmap.de/wiki/TaggingPresets 的說明。"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "加入新的標籤預設組合來源到清單。"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "標籤預設組合來源"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "匯入 TCX 檔案..."
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "將 TCX 檔案匯入為 GPS 軌跡"
+
+#~ msgid "Overlap tiles"
+#~ msgstr "重疊拼貼"
+
+#~ msgid "% of lat:"
+#~ msgstr "% 緯度："
+
+#~ msgid "% of lon:"
+#~ msgstr "% 經度："
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "直接從 JOSM 載入 TCX 檔案。"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"