Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 17485)
+++ applications/editors/josm/i18n/po/he.po	(revision 17595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-06 13:51+0200\n"
-"PO-Revision-Date: 2009-08-04 10:56+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-09-12 18:11+0200\n"
+"PO-Revision-Date: 2009-09-07 18:36+0000\n"
+"Last-Translator: ilangut <Unknown>\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-09-06 11:37+0000\n"
+"X-Launchpad-Export-Date: 2009-09-12 16:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:193
+#: ../core/src/org/openstreetmap/josm/Main.java:194
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:203
+#: ../core/src/org/openstreetmap/josm/Main.java:204
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,18 +32,20 @@
 msgstr "עזרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:296
+#: ../core/src/org/openstreetmap/josm/Main.java:297
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "לא ניתן להפעיל היטל {0}. משתמש במרקטור"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:534
+#: ../core/src/org/openstreetmap/josm/Main.java:298
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/Main.java:519
+#: ../core/src/org/openstreetmap/josm/Main.java:543
+#: ../core/src/org/openstreetmap/josm/Main.java:551
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -59,8 +61,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
@@ -74,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -83,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
@@ -101,54 +103,51 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:289
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:218
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/Main.java:446
+#, java-format
 msgid ""
 "There are unsaved changes in {0} layer. Discard the changes and continue?"
 msgid_plural ""
 "There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?"
-msgstr[1] "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:452
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:453
 msgid "Unsaved Changes"
 msgstr "שינויים לא שמורים"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Save and Exit"
 msgstr "שמור וצא"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Discard and Exit"
 msgstr "התעלם משינויים וצא"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/Main.java:454
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
@@ -157,11 +156,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
@@ -175,20 +175,20 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:477
+#: ../core/src/org/openstreetmap/josm/Main.java:478
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:478
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:479
+#: ../core/src/org/openstreetmap/josm/Main.java:498
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,16 +205,16 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
@@ -244,15 +244,17 @@
 msgstr "אזהרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:496
+#: ../core/src/org/openstreetmap/josm/Main.java:497
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:509
-#: ../core/src/org/openstreetmap/josm/Main.java:533
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:92
+#: ../core/src/org/openstreetmap/josm/Main.java:510
+#: ../core/src/org/openstreetmap/josm/Main.java:518
+#: ../core/src/org/openstreetmap/josm/Main.java:542
+#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>אין אפשרות לקרוא קובץ''{0}''.<br>הודעת שגיאה: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
@@ -339,5 +341,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
 msgstr "תוספים"
@@ -357,4 +359,6 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"אזהרה: פורמט URL בסיס לא צפוי של ה-API, סביר כי ההפניה  מחדש לדפי המידע או "
+"ההיסטוריה תיכשל. URL בסיס של ה-API הוא: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
@@ -364,8 +368,10 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"אזהרה: פורמט URL בסיס לא צפוי של ה-API, סביר כי ההפניה  מחדש לדפי המשתמש "
+"תיכשל. URL בסיס של ה-API הוא: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr ""
+msgstr "אנא בחר לפחות צומת, דרך, או הקשר אשר כבר הועלו למאגר"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105
@@ -378,9 +384,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
 msgid "Please select the target layer."
-msgstr ""
+msgstr "אנא בחר בשכת היעד"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 msgid "Select target layer"
-msgstr ""
+msgstr "בחר שכבת יעד"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
@@ -388,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
 msgid "Merge"
-msgstr ""
+msgstr "מזג"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -399,5 +405,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
 msgid "No target layers"
-msgstr ""
+msgstr "אין שכבות יעד"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -468,9 +474,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -504,6 +510,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -522,11 +528,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:334
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
 msgstr "מידע"
@@ -548,5 +554,5 @@
 msgstr "נא בחר לפחות שלושה צמתים."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
 #, java-format
 msgid ""
@@ -555,10 +561,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
 msgid "API Capabilities Violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
 #, java-format
 msgid ""
@@ -567,5 +573,5 @@
 msgstr "הזהרה: מגביל אוטומטית את ערך התוית \"{0}\" על גבי פרימיטיב מחוק {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
 #, java-format
 msgid ""
@@ -576,9 +582,9 @@
 "הערך הוא {3}."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
 msgid "Precondition Violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
@@ -633,26 +639,22 @@
 msgstr "אין התנגשויות להתמקד בהם"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 msgid "Combine Way"
 msgstr "שלב דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 msgid "Combine several ways into one."
 msgstr "שלב מספר דרכים לאחת."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-msgid "Please select at least two ways to combine."
-msgstr "נא בחר לפחות שתי דרכים לשילוב."
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58
 msgid "Combine ways with different memberships?"
 msgstr "לשלב שתי דרכים בעלות חברויות שונות?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Combine Anyway"
 msgstr "אחד בכל זאת"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -660,13 +662,13 @@
 msgstr "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
 msgid "Change directions?"
 msgstr "לשנות כיוונים?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Reverse and Combine"
 msgstr "הפוך כיוון ואחד"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -674,30 +676,18 @@
 msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:214
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
-msgid "Enter values for all conflicts."
-msgstr "הזן ערכים לכל ההתנגשויות."
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-msgid "Solve Conflicts"
-msgstr "פתור התנגשויות"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
-#, java-format
-msgid "Combine {0} ways"
-msgstr "שלב {0} דרכים"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
-msgid "All the ways were empty"
-msgstr "כל הדרכים היו ריקות"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
 "nodes)"
 msgstr "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
+#, java-format
+msgid "Combine {0} ways"
+msgstr "שלב {0} דרכים"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228
+msgid "Please select at least two ways to combine."
+msgstr "נא בחר לפחות שתי דרכים לשילוב."
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32
@@ -726,5 +716,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204
 msgid "Those nodes are not in a circle. Aborting."
-msgstr ""
+msgstr "הצמתים הללו אינם חלק ממעגל. מבטל."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
@@ -733,4 +723,5 @@
 "three nodes."
 msgstr ""
+"יש לבחור בדיוק שתים או שלוש צמתים או דרך אחת עם בדיוק שתים או שלוש צמתים"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
@@ -751,5 +742,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
 msgstr "מחק"
@@ -759,15 +750,15 @@
 msgstr "מחק את הפריטים הנבחרים."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
 msgid "Overwrite"
 msgstr "שכתוב"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210
 msgid "File exists. Overwrite?"
 msgstr "הקובץ כבר קיים. לשכתב?"
@@ -778,9 +769,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
 msgid "Distribute Nodes"
-msgstr ""
+msgstr "פזר צמתים"
 
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 msgid "Distribute the selected nodes to equal distances along a line."
-msgstr ""
+msgstr "פזר את הצמתים הנבחרים במרחקים  שווים לאורך קו"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
@@ -796,10 +787,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #, java-format
 msgid "File: {0}"
@@ -830,5 +821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
 #, java-format
@@ -838,5 +829,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125
 msgid "Conflicts during download"
-msgstr ""
+msgstr "התנגשות במהלך ההורדה"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145
@@ -871,7 +862,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202
-#, fuzzy
 msgid "All Formats"
-msgstr "כל התמונות"
+msgstr "כל הפורמטים"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -895,5 +885,5 @@
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
-msgstr ""
+msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
@@ -905,5 +895,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
 msgid "Export GPX file"
-msgstr ""
+msgstr "יצא קובץ GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
@@ -970,10 +960,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
 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
 msgid "Info about Element"
-msgstr ""
+msgstr "מידע אודות אלמנט"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
@@ -1004,1028 +994,27 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge the current layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+msgstr "מזג את השכבה הנוכחית לתוך שכבה אחרת"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge Nodes"
 msgstr "מיזוג צמתים"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 msgid "Merge nodes into the oldest one."
 msgstr "מזג את הצמתים לישנים ביותר."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
 msgid "Please select at least two nodes to merge."
 msgstr "אנא בחר לפחות שני צמתים למיזוג."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
-msgid "Merge nodes with different memberships?"
-msgstr "למזג צמתים בעלי חברויות שונות?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
-msgid "Merge Anyway"
-msgstr "מזג בכל זאת"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-msgid ""
-"The selected nodes have differing relation memberships.  Do you still want "
-"to merge them?"
-msgstr ""
-"לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301
-#, java-format
-msgid "Merge {0} nodes"
-msgstr "מזג {0} צמתים"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-msgid "Merge selection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-msgid "Merge the currently selected primitives into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
-msgid "Mirror"
-msgstr "שיקוף"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-msgid "Mirror selected nodes and ways."
-msgstr "שקף את הנקודות והדרכים הבחורות"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
-msgid "Please select at least one node or way."
-msgstr "נא לבחור לפחות נקודה אחת או דרך"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
-msgid "up"
-msgstr "למעלה"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
-#, java-format
-msgid "Move objects {0}"
-msgstr "הזז פריטים {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-msgid "down"
-msgstr "למטה"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-msgid "left"
-msgstr "שמאלה"
-
-#. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
-msgid "right"
-msgstr "ימינה"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
-#, java-format
-msgid "Move {0}"
-msgstr "הזז {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
-#, java-format
-msgid "Moves Objects {0}"
-msgstr "הזז את הפריטים {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-msgid "Cannot move objects outside of the world."
-msgstr "לא ניתן להזיז פריטים אל מחוץ לעולם."
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
-msgid "New"
-msgstr "חדש"
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-msgid "Create a new map."
-msgstr "צור מפה חדשה."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
-msgid "Open..."
-msgstr "פתח..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
-msgid "Open a file."
-msgstr "פתח קובץ."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65
-#, fuzzy
-msgid "Opening files"
-msgstr "פתח קובץ."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84
-#, java-format
-msgid "Opening file ''{0}'' ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-msgid "Open Location..."
-msgstr "פתח מיקום..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-msgid "Open an URL."
-msgstr "פתח URL"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
-msgid "Separate Layer"
-msgstr "שכבה נפרדת"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
-msgid "Enter URL to download:"
-msgstr "הזן כתובת להורדה:"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
-msgid "Download Location"
-msgstr "מיקום ההורדה"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-msgid "Download URL"
-msgstr "כתובת הורדה"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Orthogonalize Shape"
-msgstr "ישר זוויות צורה"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
-msgid "Move nodes so all angles are 90 or 270 degree"
-msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
-msgid "Only two nodes allowed"
-msgstr "מותרות רק שתי נקודות"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
-msgid "Selection must consist only of ways."
-msgstr "בחירה חייבת לכלול רק דרכים."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
-msgid "Please select one or more closed ways of at least four nodes."
-msgstr "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
-msgid ""
-"<html>You are using the EPSG:4326 projection which might lead<br>to "
-"undesirable results when doing rectangular alignments.<br>Change your "
-"projection to get rid of this warning.<br>Do you want to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
-msgid "Only one node selected"
-msgstr "נבחרה רק נקודה אחת"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
-msgid "Orthogonalize"
-msgstr "יישר"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113
-msgid "Paste"
-msgstr "הדבק"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-msgid "Paste contents of paste buffer."
-msgstr "הדבק את תכני חוצץ ההדבקה."
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
-msgid "Paste Tags"
-msgstr "הדבק תגיות"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
-msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "החל תגיות של תוכן מחוצץ ההדבקה על כל הפריטים הנבחרים."
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116
-#, fuzzy, java-format
-msgid "Pasting {0} tag"
-msgid_plural "Pasting {0} tags"
-msgstr[0] "טוען {0}"
-msgstr[1] "טוען {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117
-#, java-format
-msgid "to {0} primitive"
-msgid_plural "to {0} primtives"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Preferences..."
-msgstr "מאפיינים..."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Open a preferences page for global settings."
-msgstr "פתח את עמוד ההעדפות להגדרות כלליות."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
-msgid "Preferences"
-msgstr "העדפות"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-msgid "Redo"
-msgstr "בצע שוב"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "בצע שוב את הפעולה האחרונה שבוטלה."
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
-msgid "Rename layer"
-msgstr "שנה את שם השכבה"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
-msgid "Also rename the file"
-msgstr "שנה גם את שם הקובץ"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
-#, java-format
-msgid "Could not rename file ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-msgid "Reverse Ways"
-msgstr "הפוך דרכים"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-msgid "Reverse the direction of all selected ways."
-msgstr "הפוך את הכיוונים של כל הדרכים הנבחרות."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
-msgid "Please select at least one way."
-msgstr "אנא בחר לפחות דרך אחת."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
-msgid "Reverse ways"
-msgstr "הפוך דרכים"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
-msgid "Save"
-msgstr "שמירה"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
-msgid "Save the current data."
-msgstr "שמור את הנתונים הנוכחיים."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#, java-format
-msgid "File {0} exists. Overwrite?"
-msgstr "הקובץ {0} כבר קיים. לדרוס אותו?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-msgid "No Exporter found! Nothing saved."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "Empty document"
-msgstr "מסמך ריק"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "The document contains no data."
-msgstr "המסמך לא מכיל נתונים"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
-msgid "Save anyway"
-msgstr "שמור בכל זאת"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
-msgid "Conflicts"
-msgstr "התנגשויות"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"ישנן התנגשויות בלתי פתורות. ההתנגשויות לא ישמרו ויטופלו כאילו דחית הכל. "
-"להמשיך?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
-msgid "Reject Conflicts and Save"
-msgstr "דחה התנגשויות ושמור"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
-msgid "Save OSM file"
-msgstr "שמור קובץ OSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
-msgid "Save GPX file"
-msgstr "שמור קובץ GPX"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
-msgid "Save Layer"
-msgstr "שמור שכבה"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
-msgid "Save As..."
-msgstr "שמור בשם..."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
-msgid "Save the current data to a new file."
-msgstr "שמור את המידע הנוכחי לקובץ חדש."
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-msgid "Select All"
-msgstr "בחר הכל"
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-msgid ""
-"Select all undeleted objects in the data layer. This selects incomplete "
-"objects too."
-msgstr ""
-"בחר את כל העצמים הבלתי בחורים בשכבת הנתונים. גם עצמים בלתי גמורים ייבחרו."
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-msgid "Show Status Report"
-msgstr "הצג דו\"ח מצב"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
-msgid "Show status report with useful information that can be attached to bugs"
-msgstr "הצג דו\"ח מצב עם מידע שימושי שיכול ליהיות מצורף לבאגים"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
-#, java-format
-msgid "Help: {0}"
-msgstr "עזרה: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-msgid "Status Report"
-msgstr "דו\"ח מצב"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
-msgid "Copy to clipboard and close"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:245
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
-msgid "Close"
-msgstr "סגור"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-msgid "Split Way"
-msgstr "פצל דרך"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-msgid "Split a way at the selected node."
-msgstr "פצל דרך בנקודה הבחורה."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
-msgid "The current selection cannot be used for splitting."
-msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
-msgid "The selected node is not in the middle of any way."
-msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "הנקודה הנבחרת לא נמצאת בתוך אף דרך."
-msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
-msgid ""
-"There is more than one way using the node you selected. Please select the "
-"way also."
-msgid_plural ""
-"There is more than one way using the nodes you selected. Please select the "
-"way also."
-msgstr[0] "יותר מדרך אחת משתמשת בנקודה שבחרת. בחר גם את הדרך."
-msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
-msgid "The selected nodes do not share the same way."
-msgstr "הנקודות הבחורות אינן שייכות לאותה דרך."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
-msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
-msgid "You must select two or more nodes to split a circular way."
-msgstr "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
-msgid ""
-"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
-"middle of the way.)"
-msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
-msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
-#, java-format
-msgid "Split way {0} into {1} parts"
-msgstr "פצל דרך {0} ל-{1} חלקים"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#, fuzzy
-msgid "Close the current changeset ..."
-msgstr "שמור את הנתונים הנוכחיים."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-#, fuzzy
-msgid "No open changeset"
-msgstr "אל תחל את השינויים"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-#, fuzzy
-msgid "Closing changeset"
-msgstr "דרכים חוצות"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-msgid "Toggle GPX Lines"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-msgid "Draw lines between raw gps points."
-msgstr "צייר קווים בין נקודות ה-gps הגולמיות."
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#, java-format
-msgid "Toggles the global setting ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-msgid "UnGlue Ways"
-msgstr "הפרד דרכים"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-msgid "Duplicate nodes that are used by multiple ways."
-msgstr "שכפל נקודות המשותפות למספר דרכים."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
-msgid "This node is not glued to anything else."
-msgstr "הנקודה לא מוצמדת לשום דבר אחר."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
-msgid "None of these nodes are glued to anything else."
-msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
-msgid "None of this way's nodes are glued to anything else."
-msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
-msgid "The current selection cannot be used for unglueing."
-msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "Select either:"
-msgstr "בחר:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
-msgid "* One tagged node, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
-msgid "* One node that is used by more than one way, or"
-msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
-msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr "* דרך אחת בעלת אחת או יותר נקודות המשותפות ליותר מדרך אחת, או"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr "* דרך אחת ונקודה אחת או יותר שלה המשותפות ליותר מדרך אחת."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
-msgid ""
-"Note: If a way is selected, this way will get fresh copies of the unglued\n"
-"nodes and the new nodes will be selected. Otherwise, all ways will get "
-"their\n"
-"own copy and all nodes will be selected."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
-msgid "Unglued Node"
-msgstr "הפרד נקודה"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
-#, java-format
-msgid "Dupe into {0} nodes"
-msgstr ""
-
-#. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-msgid "Undo"
-msgstr "בטל"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "בטל את הפעולה האחרונה."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
-msgid "Unselect All"
-msgstr "בטל את כל הבחירות"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-msgid "Unselect all objects."
-msgstr "בטל את כל בחירות העצמים"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-msgid "Unselect All (Focus)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-msgid "Unselect All (Escape)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
-msgid "Update Data"
-msgstr "עדכן נתונים"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr ""
-
-#. bounds defined? => use the bbox downloader
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
-msgid "No current dataset found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
-msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
-msgid "Update Selection"
-msgstr "עדכן בחירה"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
-msgid "Updates the currently selected primitives from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
-msgid "There are no selected primitives to update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
-msgid "Selection empty"
-msgstr "בחירה ריקה"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
-msgid "Upload to OSM..."
-msgstr "העלה ל-OSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
-msgid "Upload all changes to the OSM server."
-msgstr "העלה את כל השינויים לשרת ה-OSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#, fuzzy, java-format
-msgid ""
-"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-"resolve them first.<html>"
-msgstr "ישנן התנגשויות שאינן פתורות. עליך לפתור אותן תחילה."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
-msgid "Nothing to upload. Get some data first."
-msgstr "אין מה להעלות. קבל כמה נתונים תחילה."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
-msgid "No changes to upload."
-msgstr "אין שינויים להעלאה."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr "סנכרן רק את {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
-msgid "Synchronize entire dataset"
-msgstr "סנכרן את כל סט הנתונים"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
-"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
-msgid "Conflict detected"
-msgstr "התגלתה התנגשות"
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr "ערך מוחזר לא צפוי. התקבל {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309
-#, java-format
-msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347
-#, java-format
-msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405
-msgid "Upload to OSM API failed"
-msgstr "העלאה ל-API של OSM נכשלה"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427
-msgid "Updating primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474
-msgid "Upload these changes?"
-msgstr "העלה את השינויים האלה?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
-msgid "Upload Changes"
-msgstr "העלה שינויים"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527
-#, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:651
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:652
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:655
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:658
-#, fuzzy
-msgid "Upload to a new or to an existing changeset?"
-msgstr "הוסף צומת חדש לדרך קיימת"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680
-msgid "upload all changes in one request"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731
-#, fuzzy
-msgid "Settings"
-msgstr "הגדרות מפה"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936
-msgid "Tags of new changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755
-msgid "Objects to add:"
-msgstr "פריטים להוספה:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761
-msgid "Objects to modify:"
-msgstr "פריטים לשינוי:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767
-msgid "Objects to delete:"
-msgstr "פריטים למחיקה:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:803
-#, fuzzy, java-format
-msgid "{0} object to add:"
-msgid_plural "{0} objects to add:"
-msgstr[0] "פריטים להוספה:"
-msgstr[1] "פריטים להוספה:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:812
-#, fuzzy, java-format
-msgid "{0} object to modifiy:"
-msgid_plural "{0} objects to modify:"
-msgstr[0] "פריטים לשינוי:"
-msgstr[1] "פריטים לשינוי:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:821
-#, fuzzy, java-format
-msgid "{0} object to delete:"
-msgid_plural "{0} objects to delete:"
-msgstr[0] "פריטים למחיקה:"
-msgstr[1] "פריטים למחיקה:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:910
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:911
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:914
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:915
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:942
-#, fuzzy, java-format
-msgid "Tags of changeset {0}"
-msgstr "שינוי אחרון ב {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-msgid "Zoom In"
-msgstr "התקרב"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-msgid "Zoom Out"
-msgstr "התרחק"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-msgid "Back"
-msgstr "חזרה"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-msgid "Jump back."
-msgstr "עבור אחורה."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-#, java-format
-msgid "Audio: {0}"
-msgstr "שמע: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-msgid "Faster"
-msgstr "מהר יותר"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-msgid "Faster Forward"
-msgstr "הרצה מהירה"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-msgid "Forward"
-msgstr "העבר"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-msgid "Jump forward"
-msgstr "קפוץ הלאה"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-msgid "Next Marker"
-msgstr "הסימון הבא"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-msgid "Play next marker."
-msgstr "נגן את הסמן הבא."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-msgid "Play/Pause"
-msgstr "נגן\\השהה"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-msgid "Play/pause audio."
-msgstr "נגן/השהה את השמע."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-msgid "Previous Marker"
-msgstr "הסמן הקודם"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-msgid "Play previous marker."
-msgstr "נגן את הסמן הקודם."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-msgid "Slower"
-msgstr "לאט יותר"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-msgid "Slower Forward"
-msgstr "הרצה איטית יותר"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
-msgid "Downloading GPS data"
-msgstr "מוריד נתוני GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
-msgid "Downloaded GPX Data"
-msgstr "הורדו נתוני GPX"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
-msgid "Raw GPS data"
-msgstr "נתוני GPS גולמיים"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
-msgid "Downloading data"
-msgstr "מוריד נתונים"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, java-format
-msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119
-msgid "No data imported."
-msgstr "לא יובאו נתונים."
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150
-msgid "OpenStreetMap data"
-msgstr "נתוני OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
-#, java-format
-msgid "Download {0} of {1} ({2} left)"
-msgstr "מוריד {0} מ-{1} (נותרו {2})"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110
-msgid "Errors during Download"
-msgstr "שגיאות במהלך הורדה"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175
-#, java-format
-msgid ""
-"<html>There are {0} primitives in your local dataset which<br>might be "
-"deleted on the server. If you later try to delete or<br>update them the "
-"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191
-msgid "Deleted or moved primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
-msgid "Delete Mode"
-msgstr "מצב מחיקה"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
-msgid "Delete nodes or ways."
-msgstr "מחק צמתים או דרכים."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
-#, java-format
-msgid "Mode: {0}"
-msgstr "נקודה: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
-"when deleting a way. Ctrl: delete referring objects."
-msgstr ""
-"לחץ למחיקה. Shift: מחק מקטע דרך. Alt: אל תמחק צמתים שאינם בשימוש בעת מחיקת "
-"דרך. Ctrl: מחק פריטים מפנים."
-
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -2036,7 +1025,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:287
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
@@ -2045,6 +1035,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -2075,4 +1065,872 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+msgid "Cannot merge nodes: Would have to delete a way that is still used."
+msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#, java-format
+msgid "Merge {0} nodes"
+msgstr "מזג {0} צמתים"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+msgid "Merge selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
+msgid "Merge the currently selected primitives into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+msgid "Mirror"
+msgstr "שיקוף"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+msgid "Mirror selected nodes and ways."
+msgstr "שקף את הנקודות והדרכים הבחורות"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+msgid "Please select at least one node or way."
+msgstr "נא לבחור לפחות נקודה אחת או דרך"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+msgid "up"
+msgstr "למעלה"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#, java-format
+msgid "Move objects {0}"
+msgstr "הזז פריטים {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+msgid "down"
+msgstr "למטה"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+msgid "left"
+msgstr "שמאלה"
+
+#. dir == Direction.RIGHT) {
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+msgid "right"
+msgstr "ימינה"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#, java-format
+msgid "Move {0}"
+msgstr "הזז {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#, java-format
+msgid "Moves Objects {0}"
+msgstr "הזז את הפריטים {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+msgid "Cannot move objects outside of the world."
+msgstr "לא ניתן להזיז פריטים אל מחוץ לעולם."
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+msgid "New"
+msgstr "חדש"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+msgid "Create a new map."
+msgstr "צור מפה חדשה."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+msgid "Open..."
+msgstr "פתח..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+msgid "Open a file."
+msgstr "פתח קובץ."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+msgid "Opening files"
+msgstr "פותח קבצים"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#, java-format
+msgid "Opening file ''{0}'' ..."
+msgstr "פותח קובץ ''{0}'' ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+msgid "Open Location..."
+msgstr "פתח מיקום..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+msgid "Open an URL."
+msgstr "פתח URL"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
+msgid "Separate Layer"
+msgstr "שכבה נפרדת"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
+msgid "Enter URL to download:"
+msgstr "הזן כתובת להורדה:"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
+msgid "Download Location"
+msgstr "מיקום ההורדה"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+msgid "Download URL"
+msgstr "כתובת הורדה"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
+msgid "Orthogonalize Shape"
+msgstr "ישר זוויות צורה"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+msgid "Move nodes so all angles are 90 or 270 degree"
+msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
+msgid "Only two nodes allowed"
+msgstr "מותרות רק שתי נקודות"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+msgid "Selection must consist only of ways."
+msgstr "בחירה חייבת לכלול רק דרכים."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
+msgid "Please select one or more closed ways of at least four nodes."
+msgstr "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
+msgid ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
+msgid "Only one node selected"
+msgstr "נבחרה רק נקודה אחת"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
+msgid "Orthogonalize"
+msgstr "יישר"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
+msgid "Paste"
+msgstr "הדבק"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+msgid "Paste contents of paste buffer."
+msgstr "הדבק את תכני חוצץ ההדבקה."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+msgid "Paste Tags"
+msgstr "הדבק תגיות"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr "החל תגיות של תוכן מחוצץ ההדבקה על כל הפריטים הנבחרים."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124
+#, java-format
+msgid "Pasting {0} tag"
+msgid_plural "Pasting {0} tags"
+msgstr[0] "מדביק תג {0}"
+msgstr[1] "מדביק תגים {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125
+#, java-format
+msgid "to {0} primitive"
+msgid_plural "to {0} primtives"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Preferences..."
+msgstr "מאפיינים..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Open a preferences page for global settings."
+msgstr "פתח את עמוד ההעדפות להגדרות כלליות."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+msgid "Preferences"
+msgstr "העדפות"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+msgid "Redo"
+msgstr "בצע שוב"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "בצע שוב את הפעולה האחרונה שבוטלה."
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+msgid "Rename layer"
+msgstr "שנה את שם השכבה"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+msgid "Also rename the file"
+msgstr "שנה גם את שם הקובץ"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#, java-format
+msgid "Could not rename file ''{0}''"
+msgstr "לא ניתן לשנות את שם הקובץ ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+msgid "Reverse Ways"
+msgstr "הפוך דרכים"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+msgid "Reverse the direction of all selected ways."
+msgstr "הפוך את הכיוונים של כל הדרכים הנבחרות."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+msgid "Please select at least one way."
+msgstr "אנא בחר לפחות דרך אחת."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+msgid "Reverse ways"
+msgstr "הפוך דרכים"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
+msgid "Save"
+msgstr "שמירה"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
+msgid "Save the current data."
+msgstr "שמור את הנתונים הנוכחיים."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#, java-format
+msgid "File {0} exists. Overwrite?"
+msgstr "הקובץ {0} כבר קיים. לדרוס אותו?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+msgid "No Exporter found! Nothing saved."
+msgstr "לא נמצא מייצא! לא נשמר דבר."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
+msgid "Empty document"
+msgstr "מסמך ריק"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+msgid "Save anyway"
+msgstr "שמור בכל זאת"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "The document contains no data."
+msgstr "המסמך לא מכיל נתונים"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgid "Conflicts"
+msgstr "התנגשויות"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+msgid "Reject Conflicts and Save"
+msgstr "דחה התנגשויות ושמור"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"ישנן התנגשויות בלתי פתורות. ההתנגשויות לא ישמרו ויטופלו כאילו דחית הכל. "
+"להמשיך?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+msgid "Save OSM file"
+msgstr "שמור קובץ OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+msgid "Save GPX file"
+msgstr "שמור קובץ GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+msgid "Save Layer"
+msgstr "שמור שכבה"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
+msgid "Save As..."
+msgstr "שמור בשם..."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
+msgid "Save the current data to a new file."
+msgstr "שמור את המידע הנוכחי לקובץ חדש."
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+msgid "Select All"
+msgstr "בחר הכל"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+"בחר את כל העצמים הבלתי בחורים בשכבת הנתונים. גם עצמים בלתי גמורים ייבחרו."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+msgid "Show Status Report"
+msgstr "הצג דו\"ח מצב"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr "הצג דו\"ח מצב עם מידע שימושי שיכול ליהיות מצורף לבאגים"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#, java-format
+msgid "Help: {0}"
+msgstr "עזרה: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+msgid "Status Report"
+msgstr "דו\"ח מצב"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+msgid "Copy to clipboard and close"
+msgstr "העתק ללוח הגזירים וסגור"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
+msgid "Close"
+msgstr "סגור"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+msgid "Split Way"
+msgstr "פצל דרך"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+msgid "Split a way at the selected node."
+msgstr "פצל דרך בנקודה הבחורה."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+msgid "The current selection cannot be used for splitting."
+msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "הנקודה הנבחרת לא נמצאת בתוך אף דרך."
+msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+msgid ""
+"There is more than one way using the node you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] "יותר מדרך אחת משתמשת בנקודה שבחרת. בחר גם את הדרך."
+msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+msgid "The selected nodes do not share the same way."
+msgstr "הנקודות הבחורות אינן שייכות לאותה דרך."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
+msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+msgid "You must select two or more nodes to split a circular way."
+msgstr "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+msgid ""
+"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
+"middle of the way.)"
+msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr "פצל דרך {0} ל-{1} חלקים"
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
+msgid "Close current changeset"
+msgstr "סגור את סט השינויים הנוכחי"
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
+msgid "Close the current changeset ..."
+msgstr "סגור את סט השינויים הנוכחי ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
+msgid "There is currently no changeset open."
+msgstr "אין סט שינויים פתוח כרגע"
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+msgid "Toggle GPX Lines"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+msgid "Draw lines between raw gps points."
+msgstr "צייר קווים בין נקודות ה-gps הגולמיות."
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#, java-format
+msgid "Toggles the global setting ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+msgid "UnGlue Ways"
+msgstr "הפרד דרכים"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+msgid "Duplicate nodes that are used by multiple ways."
+msgstr "שכפל נקודות המשותפות למספר דרכים."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+msgid "This node is not glued to anything else."
+msgstr "הנקודה לא מוצמדת לשום דבר אחר."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+msgid "None of these nodes are glued to anything else."
+msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+msgid "None of this way's nodes are glued to anything else."
+msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "The current selection cannot be used for unglueing."
+msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid "Select either:"
+msgstr "בחר:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+msgid "* One tagged node, or"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+msgid "* One node that is used by more than one way, or"
+msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr "* דרך אחת בעלת אחת או יותר נקודות המשותפות ליותר מדרך אחת, או"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
+msgstr "* דרך אחת ונקודה אחת או יותר שלה המשותפות ליותר מדרך אחת."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+msgid ""
+"Note: If a way is selected, this way will get fresh copies of the unglued\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get "
+"their\n"
+"own copy and all nodes will be selected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+msgid "Unglued Node"
+msgstr "הפרד נקודה"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#, java-format
+msgid "Dupe into {0} nodes"
+msgstr ""
+
+#. only one changeCommand for a way, else garbage will happen
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#, java-format
+msgid "Dupe {0} nodes into {1} nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+msgid "Undo"
+msgstr "בטל"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "בטל את הפעולה האחרונה."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+msgid "Unselect All"
+msgstr "בטל את כל הבחירות"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+msgid "Unselect all objects."
+msgstr "בטל את כל בחירות העצמים"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+msgid "Unselect All (Focus)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+msgid "Unselect All (Escape)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+msgid "Update Data"
+msgstr "עדכן נתונים"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
+msgid "Updates the current data layer from the server (re-downloads data)"
+msgstr ""
+
+#. bounds defined? => use the bbox downloader
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
+msgid "No current dataset found"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
+msgid "Didn't find a primitive with id {0} in the current dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
+msgid "Update Selection"
+msgstr "עדכן בחירה"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
+msgid "Updates the currently selected primitives from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
+msgid "There are no selected primitives to update."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
+msgid "Selection empty"
+msgstr "בחירה ריקה"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+msgid "Upload to OSM..."
+msgstr "העלה ל-OSM..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+msgid "Upload all changes to the OSM server."
+msgstr "העלה את כל השינויים לשרת ה-OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#, java-format
+msgid ""
+"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+"resolve them first.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+msgid "Nothing to upload. Get some data first."
+msgstr "אין מה להעלות. קבל כמה נתונים תחילה."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+msgid "No changes to upload."
+msgstr "אין שינויים להעלאה."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr "סנכרן רק את {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+msgid "Synchronize entire dataset"
+msgstr "סנכרן את כל סט הנתונים"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
+"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+msgid "Conflict detected"
+msgstr "התגלתה התנגשות"
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#, java-format
+msgid "unexpected return value. Got {0}"
+msgstr "ערך מוחזר לא צפוי. התקבל {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#, java-format
+msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#, java-format
+msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#, java-format
+msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+msgid "Upload to OSM API failed"
+msgstr "העלאה ל-API של OSM נכשלה"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+msgid "Updating primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+msgid "Zoom In"
+msgstr "התקרב"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+msgid "Zoom Out"
+msgstr "התרחק"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgid "Back"
+msgstr "חזרה"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+msgid "Jump back."
+msgstr "עבור אחורה."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#, java-format
+msgid "Audio: {0}"
+msgstr "שמע: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgid "Faster"
+msgstr "מהר יותר"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+msgid "Faster Forward"
+msgstr "הרצה מהירה"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgid "Forward"
+msgstr "העבר"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+msgid "Jump forward"
+msgstr "קפוץ הלאה"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgid "Next Marker"
+msgstr "הסימון הבא"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+msgid "Play next marker."
+msgstr "נגן את הסמן הבא."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgid "Play/Pause"
+msgstr "נגן\\השהה"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+msgid "Play/pause audio."
+msgstr "נגן/השהה את השמע."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgid "Previous Marker"
+msgstr "הסמן הקודם"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+msgid "Play previous marker."
+msgstr "נגן את הסמן הקודם."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgid "Slower"
+msgstr "לאט יותר"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+msgid "Slower Forward"
+msgstr "הרצה איטית יותר"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
+msgid "Downloading GPS data"
+msgstr "מוריד נתוני GPS"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
+msgid "Downloaded GPX Data"
+msgstr "הורדו נתוני GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
+msgid "Raw GPS data"
+msgstr "נתוני GPS גולמיים"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
+msgid "Downloading data"
+msgstr "מוריד נתונים"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
+msgid "No data imported."
+msgstr "לא יובאו נתונים."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
+msgid "OpenStreetMap data"
+msgstr "נתוני OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#, java-format
+msgid "Download {0} of {1} ({2} left)"
+msgstr "מוריד {0} מ-{1} (נותרו {2})"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
+#, java-format
+msgid "The following errors occurred during mass download:{0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
+msgid "Errors during Download"
+msgstr "שגיאות במהלך הורדה"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#, java-format
+msgid ""
+"<html>There are {0} primitives in your local dataset which<br>might be "
+"deleted on the server. If you later try to delete or<br>update them the "
+"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+msgid "Deleted or moved primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
+msgid "Delete Mode"
+msgstr "מצב מחיקה"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
+msgid "Delete nodes or ways."
+msgstr "מחק צמתים או דרכים."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
+#, java-format
+msgid "Mode: {0}"
+msgstr "נקודה: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+"when deleting a way. Ctrl: delete referring objects."
+msgstr ""
+"לחץ למחיקה. Shift: מחק מקטע דרך. Alt: אל תמחק צמתים שאינם בשימוש בעת מחיקת "
+"דרך. Ctrl: מחק פריטים מפנים."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
@@ -2187,18 +2045,18 @@
 "לסנכרון השמע בנקודה זו."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:95
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid "Select"
 msgstr "בחר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 msgid "Select, move and rotate objects"
 msgstr "בחר, הזז והטה פריטים"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2207,17 +2065,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 #, java-format
 msgid ""
@@ -2227,5 +2085,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
 msgid "Always move and don't show dialog again"
 msgstr ""
@@ -2343,7 +2201,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
-#, fuzzy
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr "<b>nodes:</b>...-עצמים עם מספר הנקודות הנתון"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
@@ -2394,41 +2251,41 @@
 msgstr "חפש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Start Search"
 msgstr "התחל חיפוש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "לא נמצאה התאמה עבור \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
 #, java-format
 msgid "Found {0} matches"
 msgstr "נמצאו {0} התאמות"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
 msgid "RX"
 msgstr "RX"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
 #, java-format
 msgid ""
@@ -2441,40 +2298,40 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530
 msgid "Missing arguments for or."
 msgstr "חסרים ארגומנטים ל-or."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540
 msgid "Missing argument for not."
 msgstr "חסרים ארגומנטים ל-not."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550
 msgid "Expected closing parenthesis."
 msgstr "ציפיתי לסוגר סוגריים."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612
 msgid "Wrong number of parameters for nodes operator."
 msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
 #, java-format
 msgid ""
@@ -2483,5 +2340,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2518,7 +2375,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
-#, fuzzy, java-format
+#, java-format
 msgid "Add node {0}"
-msgstr "הוסף צומת"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -2528,52 +2385,52 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
-#, fuzzy, java-format
+#, java-format
 msgid "Add relation {0}"
-msgstr "יחסים: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Change node {0}"
-msgstr "שנה עצם {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
-#, fuzzy, java-format
+#, java-format
 msgid "Change way {0}"
-msgstr "שינוי אחרון ב {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
-#, fuzzy, java-format
+#, java-format
 msgid "Change relation {0}"
-msgstr "שנה יחס"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr "הסר \"{0}\" מ-{1} \"{2}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr "הסר \"{0}\" מ-{1} \"{2}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr "הסר \"{0}\" מ-{1} \"{2}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for node ''{2}''"
-msgstr "קבע {0}={1} עבור {2} \"{3}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr "קבע {0}={1} עבור {2} \"{3}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr "קבע {0}={1} עבור {2} \"{3}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
@@ -2643,30 +2500,30 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] "מחק {0}{1}"
-msgstr[1] "מחק {0}{1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} node"
 msgid_plural "Delete {0} nodes"
-msgstr[0] "מצב מחיקה"
-msgstr[1] "מצב מחיקה"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] "מחק {0}{1}"
-msgstr[1] "מחק {0}{1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
-#, fuzzy, java-format
+#, java-format
 msgid "Delete {0} relation"
 msgid_plural "Delete {0} relations"
-msgstr[0] "מחק מיחס"
-msgstr[1] "מחק מיחס"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
@@ -2700,5 +2557,5 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2778,17 +2635,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr "פתור התנגשות התווית {0} ב-{1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr "פתור התנגשות התווית {0} ב-{1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr "פתור התנגשות התווית {0} ב-{1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
@@ -2798,17 +2655,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for node {0}"
-msgstr "פתור התנגשות גירסאות ב-{0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for way {0}"
-msgstr "פתור התנגשות גירסאות ב-{0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflicts for relation {0}"
-msgstr "פתור התנגשות גירסאות ב-{0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
@@ -2944,9 +2801,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
 "<br> and creating a new default preference file.</html>"
-msgstr "קובץ המאפיינים מכיל שגיאות. מגבה קובץ ישן ל {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
@@ -3013,5 +2870,5 @@
 msgstr "מזרח"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
 #, java-format
@@ -3019,23 +2876,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
+#, fuzzy, java-format
+msgid "paramete''{0}'' must not be null"
+msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
+#, java-format
+msgid "unsupported value ''{0}'' or parameter ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
 #, java-format
 msgid "Error: {0}"
 msgstr "שגיאה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
 #, java-format
 msgid "Warning: {0}"
 msgstr "אזהרה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#, fuzzy, java-format
+msgid "expected id >= 0. Got {0}"
+msgstr "אינדקס טור לא צפוי. התקבל {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#, fuzzy, java-format
+msgid "id > 0 expected. Got {0}"
+msgstr "ערך מוחזר לא צפוי. התקבל {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#, java-format
+msgid "version > 0 expected. Got {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
 #, java-format
@@ -3048,11 +2930,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:571
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:605
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
 "tag collection can't be applied to a primitive because there are keys with "
 "multiple values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
+msgid "can't add node {0} to incomplete way {1}"
 msgstr ""
 
@@ -3103,9 +2990,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3114,118 +3001,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:835
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
 msgid "Empty member in relation."
 msgstr "איבר ריק ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:837
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "מחק איבר \"{0}\" ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:848
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "הדרך \"{0}\" בת פחות משתי נקודות."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "יותר מ-\"to\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "יותר מ-\"via\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "אף דרך \"from\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "אף דרך \"to\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:660
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:673
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:677
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "דרך פנימית ''{0}'' נמצאת בחוץ."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
 msgid "untagged"
 msgstr "לא מתוייג"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
 msgid "text"
 msgstr "טקסט"
@@ -3248,5 +3135,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3257,5 +3144,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3266,5 +3153,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3373,5 +3260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "railway"
 msgstr "מסילת רכבת"
@@ -3403,127 +3290,33 @@
 msgstr[1] "{0} חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
-#, java-format
-msgid ""
-"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
-"the server URL in your preferences and your internet connection.</html>"
-msgstr ""
-
-#. item "Ways/Cycleway" combo "Pedestrians"
-#. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:58
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:228
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2439
-#: build/trans_presets.java:2440 build/trans_presets.java:2441
-msgid "unknown"
-msgstr "לא ידוע"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
-#, java-format
-msgid ""
-"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-"changeset will automatically be closed by the server after a timeout.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
-#, java-format
-msgid ""
-"<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
 msgid "Precondition violation"
 msgstr "הפרת תנאי מקדים"
 
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+msgid "Security exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+msgid "Network exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+msgid "IO Exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+msgid "Internal Server Error"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-"security reasons. This is most likely because you are running<br>in an "
-"applet and because you didn''t load your applet from ''{1}''.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139
-msgid "Security exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
-"check your internet connection.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
-msgid "Network exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179
-#, java-format
-msgid ""
-"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
-"problem with transferring data.<br>Details(untranslated): {1}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189
-msgid "IO Exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:203
-#, java-format
-msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:213
-msgid "Internal Server Error"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:235
-#, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
-"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
-"preferences and your internet connection.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245
+msgid "Bad Request"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "Unknown host"
 msgstr "מארח לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because a primitive you tried "
-"to<br>delete on the server is already deleted.<br><br>The error message is:"
-"<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231
 msgid "Primitive already deleted"
 msgstr ""
@@ -3740,5 +3533,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
 msgid "Menu: {0}"
@@ -4123,4 +3916,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
@@ -4192,8 +3987,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
@@ -4316,5 +4111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:50
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63
 msgid "deleted"
 msgstr "מחוק"
@@ -4374,5 +4169,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:197
 msgid "No, abort"
 msgstr ""
@@ -4414,4 +4209,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
@@ -4425,5 +4221,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4529,4 +4325,40 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
+msgid "Conflicts when combining primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
+#, java-format
+msgid "Conflicts when combining ways - combined way is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
+#, java-format
+msgid "Conflicts when merging nodes - merged node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
+#, fuzzy
+msgid "No conflicts to resolve"
+msgstr "אין התנגשויות להתמקד בהם"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgid "Cancel conflict resolution"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+msgid "Apply resolved conflicts"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+msgid "Apply"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
@@ -4539,24 +4371,23 @@
 msgstr "הכל"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
 msgid "Choose a value"
-msgstr "בחר צבע"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
 msgid "Please decided which values to keep"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
 #, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65
 #, java-format
 msgid "The key ''{0}'' and all it's values are going to be removed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:56
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
@@ -4564,7 +4395,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
-#, fuzzy, java-format
+#, java-format
 msgid "parameter ''{0}'' must not be empty"
-msgstr "הפרמטר '{0}' לא יכול ליהיות ריק (null)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
@@ -4577,15 +4408,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
 msgid "not yet decided"
-msgstr "לא נמחק"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:289
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr "עדיין לא הוטמע."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
@@ -4594,12 +4425,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-#, fuzzy
 msgid "Tags from ways"
-msgstr "תייג אדמה כ"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-#, fuzzy
 msgid "Tags from relations"
-msgstr "מחק מיחס"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
@@ -4627,24 +4456,8 @@
 msgstr[1] "יחסים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
-#, fuzzy
-msgid "Cancel conflict resolution"
-msgstr "פתרון התנגשות"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
-#, fuzzy
-msgid "Apply resolved conflicts"
-msgstr "פתור התנגשויות"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-msgid "Apply"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
-#, fuzzy
 msgid "Paste ..."
-msgstr "הדבק"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
@@ -4659,9 +4472,75 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
-#, fuzzy, java-format
+#, java-format
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] "דרך {0}"
-msgstr[1] "{0} דרכים"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "pos {0} is out of range. current number of members: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#, fuzzy
+msgid "Remove this relation member from the relation"
+msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+#, fuzzy
+msgid "Replace"
+msgstr "מקום"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
+msgid "Replace the way this member refers to with the combined way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#, fuzzy
+msgid "Undecided"
+msgstr "<לא מוגדר>"
+
+#. --- role editing
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+msgid "Role:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65
+msgid "Tag modified relations with   "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
+msgid "Key:"
+msgstr "מפתח:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
+#, fuzzy
+msgid "Value:"
+msgstr "ערך"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
+msgid "Apply this role to all members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
+msgid "Pos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
+#, fuzzy
+msgid "Orig. Way"
+msgstr "חד סטרי"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
+#, fuzzy
+msgid "Decision"
+msgstr "מהדורה"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4688,5 +4567,5 @@
 #: ../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:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 #, java-format
 msgid "Toggle: {0}"
@@ -4717,5 +4596,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -4788,13 +4667,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, fuzzy, java-format
+#, java-format
 msgid "Way {0}"
-msgstr "מפה: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, fuzzy, java-format
+#, java-format
 msgid "Relation {0}"
-msgstr "יחסים: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
@@ -4880,5 +4759,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:112
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
 msgid "<different>"
 msgstr "<שונה>"
@@ -4937,5 +4816,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
 msgstr "הוסף"
@@ -4985,5 +4864,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3109
 msgid "Relations"
 msgstr "יחסים"
@@ -5076,9 +4955,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133
-#, fuzzy, java-format
+#, java-format
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] "מחבר"
-msgstr[1] "מחבר"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
@@ -5091,7 +4970,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
-#, fuzzy
 msgid "Launches a browser with information about the user"
-msgstr "עוד מידע על הכלי הזה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
@@ -5172,5 +5050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5188,9 +5066,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
 msgid "Child Relations"
-msgstr ""
-
-#. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
-msgid "Role:"
 msgstr ""
 
@@ -5441,11 +5314,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
-#, java-format
-msgid "child.id >0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#, java-format
+msgid "child.getId() >0 expected. Got {1}"
 msgstr ""
 
@@ -5459,7 +5332,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
-#, fuzzy
 msgid "Loading parent relations"
-msgstr "טען תוספים מוקדמים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
@@ -5583,5 +5455,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2747
 msgid "Places"
 msgstr "מקומות"
@@ -5662,5 +5534,5 @@
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
 "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Click."
+"Hold left mousebutton and draw a frame."
 msgstr ""
 
@@ -5710,7 +5582,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#, fuzzy
 msgid "Reload the history from the server"
-msgstr "העלה את המאפיינים הנוכחיים לשרת"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
@@ -6593,52 +6464,52 @@
 #: build/trans_presets.java:2332 build/trans_presets.java:2338
 #: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2448 build/trans_presets.java:2455
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2482 build/trans_presets.java:2489
-#: build/trans_presets.java:2495 build/trans_presets.java:2501
-#: build/trans_presets.java:2523 build/trans_presets.java:2530
-#: build/trans_presets.java:2537 build/trans_presets.java:2543
-#: build/trans_presets.java:2550 build/trans_presets.java:2556
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2587 build/trans_presets.java:2594
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2674
-#: build/trans_presets.java:2683 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2712
-#: build/trans_presets.java:2719 build/trans_presets.java:2739
-#: build/trans_presets.java:2749 build/trans_presets.java:2755
-#: build/trans_presets.java:2761 build/trans_presets.java:2767
-#: build/trans_presets.java:2773 build/trans_presets.java:2780
-#: build/trans_presets.java:2787 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2814 build/trans_presets.java:2821
-#: build/trans_presets.java:2828 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2848
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2897 build/trans_presets.java:2907
-#: build/trans_presets.java:2916 build/trans_presets.java:2922
-#: build/trans_presets.java:2928 build/trans_presets.java:2933
-#: build/trans_presets.java:2939 build/trans_presets.java:2945
-#: build/trans_presets.java:2954 build/trans_presets.java:2960
-#: build/trans_presets.java:2966 build/trans_presets.java:2972
-#: build/trans_presets.java:2978 build/trans_presets.java:2984
-#: build/trans_presets.java:2990 build/trans_presets.java:2997
-#: build/trans_presets.java:3003 build/trans_presets.java:3008
-#: build/trans_presets.java:3015 build/trans_presets.java:3022
-#: build/trans_presets.java:3028 build/trans_presets.java:3037
-#: build/trans_presets.java:3045 build/trans_presets.java:3051
-#: build/trans_presets.java:3057 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3089
-#: build/trans_presets.java:3095 build/trans_presets.java:3101
-#: build/trans_presets.java:3114 build/trans_presets.java:3128
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:2451 build/trans_presets.java:2458
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2485 build/trans_presets.java:2492
+#: build/trans_presets.java:2498 build/trans_presets.java:2504
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2553 build/trans_presets.java:2559
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2590 build/trans_presets.java:2597
+#: build/trans_presets.java:2604 build/trans_presets.java:2610
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2648
+#: build/trans_presets.java:2655 build/trans_presets.java:2661
+#: build/trans_presets.java:2667 build/trans_presets.java:2677
+#: build/trans_presets.java:2686 build/trans_presets.java:2701
+#: build/trans_presets.java:2707 build/trans_presets.java:2715
+#: build/trans_presets.java:2722 build/trans_presets.java:2742
+#: build/trans_presets.java:2752 build/trans_presets.java:2758
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2783
+#: build/trans_presets.java:2790 build/trans_presets.java:2797
+#: build/trans_presets.java:2803 build/trans_presets.java:2809
+#: build/trans_presets.java:2817 build/trans_presets.java:2824
+#: build/trans_presets.java:2831 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2851
+#: build/trans_presets.java:2858 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2885 build/trans_presets.java:2891
+#: build/trans_presets.java:2900 build/trans_presets.java:2910
+#: build/trans_presets.java:2919 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2948
+#: build/trans_presets.java:2957 build/trans_presets.java:2963
+#: build/trans_presets.java:2969 build/trans_presets.java:2975
+#: build/trans_presets.java:2981 build/trans_presets.java:2987
+#: build/trans_presets.java:2993 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3018 build/trans_presets.java:3025
+#: build/trans_presets.java:3031 build/trans_presets.java:3040
+#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3080
+#: build/trans_presets.java:3086 build/trans_presets.java:3092
+#: build/trans_presets.java:3098 build/trans_presets.java:3104
+#: build/trans_presets.java:3117 build/trans_presets.java:3131
+#: build/trans_presets.java:3145
 msgid "Name"
 msgstr "שם"
@@ -6648,21 +6519,19 @@
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong> in changeset <strong>{3}</strong>"
+"<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
-#, fuzzy
 msgid "Changeset info"
-msgstr "שנה יחס"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
-#, fuzzy
 msgid "Launch browser with information about the changeset"
-msgstr "עוד מידע על הכלי הזה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
-#, fuzzy, java-format
+#, java-format
 msgid "Show changeset {0}"
-msgstr "שינוי אחרון ב {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
@@ -6680,7 +6549,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
-#, fuzzy
 msgid "Select filename"
-msgstr "שם רחוב"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
@@ -6721,7 +6589,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
-#, fuzzy
 msgid "Please select a file"
-msgstr "נא בחר ערך"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87
@@ -6770,6 +6637,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-msgid "Unsafed data and conflicts"
-msgstr ""
+#, fuzzy
+msgid "Unsaved data and conflicts"
+msgstr "פתור התנגשויות"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
@@ -6786,5 +6654,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
-msgid "Unsafed data and missing associated file"
+msgid "Unsaved data and missing associated file"
 msgstr ""
 
@@ -6803,5 +6671,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-msgid "Unsafed data non-writable files"
+msgid "Unsaved data non-writable files"
 msgstr ""
 
@@ -6815,7 +6683,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-#, fuzzy
 msgid "Discard and Delete"
-msgstr "התעלם משינויים וצא"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
@@ -6828,7 +6695,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-#, fuzzy
 msgid "Save and Delete"
-msgstr "שמור וצא"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
@@ -6906,7 +6772,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
-#, fuzzy
 msgid "Should upload?"
-msgstr "בטעינה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
@@ -6915,12 +6780,141 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
+msgid "Filename"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+msgid "Upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
+msgid "Use a new changeset and close it"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+msgid ""
+"Select to upload the data using a new changeset and to close the changeset "
+"after the upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+msgid "Use a new changeset and leave it open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+msgid ""
+"Select to upload the data using a new changeset and to leave the changeset "
+"open after the upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
+msgid "Upload to a new or to an existing changeset?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
+msgid "upload all changes in one request"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
+msgid "Settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+msgid "Tags of new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+msgid "Objects to add:"
+msgstr "פריטים להוספה:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+msgid "Objects to modify:"
+msgstr "פריטים לשינוי:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+msgid "Objects to delete:"
+msgstr "פריטים למחיקה:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#, java-format
+msgid "{0} object to add:"
+msgid_plural "{0} objects to add:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#, java-format
+msgid "{0} object to modifiy:"
+msgid_plural "{0} objects to modify:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#, java-format
+msgid "{0} object to delete:"
+msgid_plural "{0} objects to delete:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
+#, java-format
+msgid "Use the existing changeset {0} and close it after upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to close the changeset "
+"after this upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
+#, java-format
+msgid "Use the existing changeset {0} and leave it open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to leave the changeset "
+"open for further uploads"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+msgid "Upload Changes"
+msgstr "העלה שינויים"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
 #, fuzzy
-msgid "Filename"
-msgstr "קובץ"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+msgid "Upload the changed primitives"
+msgstr "העלה את השינויים האלה?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
 #, fuzzy
-msgid "Upload"
-msgstr "העלאה"
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr "נא הזן שם עבור המיקום."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
+msgid "Cancel the upload and resume editing"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7157,5 +7151,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7213,7 +7206,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
-#, fuzzy
 msgid "Download data"
-msgstr "מוריד נתונים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
@@ -7276,4 +7268,13 @@
 msgid "Convert to GPX layer"
 msgstr "המר לשכבת GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#, fuzzy
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>העלאת קובץ נתוני GPS לא מעובדים נחשבת מזיקה.<br>אם אתה רוצה להעלות "
+"מסלולים, ראה כאן:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
@@ -7460,5 +7461,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
 msgstr "נא בחר את השורה למחיקה."
@@ -8273,8 +8274,4 @@
 msgstr "נטרל"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
-msgid "Key:"
-msgstr "מפתח:"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
@@ -8331,5 +8328,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:351
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
 #, java-format
@@ -8340,42 +8337,40 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
-#, fuzzy
 msgid "Add a new tag"
-msgstr "הוסף שכבה חדשה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
-#, fuzzy
 msgid "Delete the selection in the tag table"
-msgstr "מחק את השכבה הנבחרת."
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
 msgid "More information about this feature"
 msgstr "עוד מידע על הכלי הזה"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
 msgid "Optional Attributes:"
 msgstr "מאפייני רשות:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:498
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:499
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:544
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "סוג לא ידוע: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
@@ -8386,15 +8381,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:631
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "שגיאה בניתוח {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:702
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8404,18 +8399,18 @@
 msgstr[1] "שנה {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "כלום לא נבחר!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Change Properties"
 msgstr "שנה תכונות"
@@ -8442,5 +8437,4 @@
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, כנראה שחסרים תגים."
@@ -8456,7 +8450,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
 #, java-format
@@ -8532,5 +8523,5 @@
 #: ../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:124
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
 msgid "Markers from {0}"
@@ -8538,5 +8529,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:41
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8544,5 +8535,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:44
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -8563,6 +8553,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:325
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
@@ -8572,40 +8562,40 @@
 msgstr "מוריד מידע של OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
+#, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -8667,10 +8657,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:238
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
 #, java-format
 msgid ""
@@ -8678,11 +8668,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
 msgid "Creating changeset..."
-msgstr "מכין נתונים..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
 #, java-format
 msgid "Successfully opened changeset {0}"
@@ -8690,33 +8678,18 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
-msgid "No currently open changeset. Opening a new changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
-msgid ""
-"Warning: could not reuse an existing changeset as requested. Opening a new "
-"one."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
-#, java-format
-msgid "Reusing existing changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 #, java-format
 msgid "Changeset {0} is unchanged. Skipping update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#, java-format
 msgid "Updating changeset {0}..."
-msgstr "שינוי אחרון ב {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 msgid ""
 "Failed to update changeset. Either there is no current changeset or the id "
@@ -8724,44 +8697,44 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
+#, java-format
 msgid "Closing changeset {0}..."
-msgstr "צור קשר עם {0}..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
 #, java-format
 msgid "Leaving changeset {0} open..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
 msgid "Preparing..."
 msgstr "מכין..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
 msgid "Uploading..."
 msgstr "מעלה..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
 #, java-format
 msgid "Starting retry {0} of {1}."
@@ -8780,10 +8753,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17
 msgid "OSM Server Files bzip2 compressed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29
 msgid "Invalid bz2 file."
 msgstr ""
@@ -8841,6 +8814,11 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#, java-format
+msgid "(at line {0}, column {1})"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
 msgid "OSM Server Files"
 msgstr "קבצי שרת OSM"
@@ -8869,5 +8847,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16
 msgid "OSM Server Files gzip compressed"
 msgstr ""
@@ -8924,74 +8902,139 @@
 msgstr "שגיאה בזמן הניתוח."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148
-msgid "Unknown version"
-msgstr "גרסה לא ידוע"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151
-msgid "Version number missing from OSM data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153
-#, java-format
-msgid "Unknown version: {0}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#, fuzzy, java-format
+msgid "Unsupported version: {0}"
+msgstr "גירסת API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+msgid "found XML element <nd> element not as direct child of element <way>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-msgid "Found <nd> element in non-way."
-msgstr "נמצא <nd> שלא בתוך דרך."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
-msgid "<nd> has zero ref"
-msgstr "ל <nd> אין התייחסות (ref)"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204
-msgid "Found <member> element in non-relation."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208
-#, java-format
-msgid "Missing attribute \"ref\" on member in relation {0}"
+#, java-format
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
 #, java-format
-msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
-#, java-format
-msgid "Missing attribute \"type\" on member {0} in relation {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218
-#, java-format
-msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+msgid "Missing attribute ''ref'' on member in relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#, java-format
+msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#, java-format
+msgid ""
+"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#, java-format
+msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 msgid "Illegal object with id=0"
 msgstr "עצם לא חוקי עם id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
-#, java-format
-msgid ""
-"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302
-#, java-format
-msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317
-#, java-format
-msgid "Missing required attribute \"{0}\"."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#, java-format
+msgid ""
+"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+"version is ''0.6''. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
+"version is ''0.5''. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid ""
+"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+"version is ''0.5''. Got {1}"
+msgstr ""
+
+#. should not happen. API version has been checked before
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#, java-format
+msgid "Unknown or unsupported API version. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#, java-format
+msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#, java-format
+msgid "Missing required attribute ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#, java-format
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#, java-format
+msgid ""
+"way with external id ''{0}'' includes missing node with external id ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
 #, java-format
 msgid ""
@@ -9000,16 +9043,30 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#, java-format
+msgid ""
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
-msgid "Unknown relation member type {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
+msgid ""
+"Relation with external id ''{0}'' refers to missing primitive with external "
+"id ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
 msgid "Prepare OSM data..."
 msgstr "מכין נתוני OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
-msgid "Ill-formed node id"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
+#, fuzzy
+msgid "Parsing OSM data..."
+msgstr "מכין נתוני OSM..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
+#, fuzzy
+msgid "Preparing data set..."
+msgstr "מכין נתונים..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9054,33 +9111,43 @@
 msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+msgid "Starting to upload with one request per primitive ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+msgid "Starting to upload in one request ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
+#, fuzzy
+msgid "Uploading data ..."
+msgstr "מעלה..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgid ""
+"WARNING: no API version defined for data to upload. Falling back to version "
+"0.6"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
 #, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194
-#, fuzzy
-msgid "Starting to upload in one request ..."
-msgstr "אין מה להעלות. קבל כמה נתונים תחילה."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197
-msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
@@ -9118,11 +9185,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
 msgid "Skip download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
 msgstr ""
 
@@ -9135,4 +9197,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
 #, java-format
@@ -9174,20 +9241,20 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 msgid "Disable plugin"
 msgstr "נטרל תוסף"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+msgid "Keep plugin"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "לא יכול לטעון את התוסף {0}. למחוק מהמאפיינים?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
-msgid "Keep plugin"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9197,5 +9264,9 @@
 "הקיימים."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+msgid "<html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
 #, java-format
 msgid ""
@@ -9203,19 +9274,19 @@
 msgstr "שגיאה בלתי צפויה אירעה שנובעת כנראה מהתוסף \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "לפי המידע בתוסף, המחבר הוא {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr "נסה לעדכן לגירסא האחרונה של התוסף לפני דיווח על תקלה."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
 msgid "Should the plugin be disabled?"
 msgstr "האם התוסף צריך ליהיות מנוטרל?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9223,13 +9294,13 @@
 msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:317
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:367
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
@@ -9286,4 +9357,35 @@
 "{0}"
 
+#. item "Ways/Cycleway" combo "Pedestrians"
+#. item "Ways/Footway" combo "Bikes"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: build/trans_presets.java:323 build/trans_presets.java:324
+#: build/trans_presets.java:325 build/trans_presets.java:326
+#: build/trans_presets.java:327 build/trans_presets.java:328
+#: build/trans_presets.java:329 build/trans_presets.java:330
+#: build/trans_presets.java:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:449
+#: build/trans_presets.java:469 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_presets.java:773
+#: build/trans_presets.java:788 build/trans_presets.java:1330
+#: build/trans_presets.java:1397 build/trans_presets.java:1398
+#: build/trans_presets.java:1399 build/trans_presets.java:2442
+#: build/trans_presets.java:2443 build/trans_presets.java:2444
+msgid "unknown"
+msgstr "לא ידוע"
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
 #, java-format
@@ -9355,4 +9457,88 @@
 msgstr "(הטקסט כבר הועתק ל-clipboard שלך)."
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:32
+#, java-format
+msgid ""
+"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
+"the server URL in your preferences and your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:47
+#, java-format
+msgid ""
+"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
+"changeset will automatically be closed by the server after a timeout.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:62
+#, java-format
+msgid ""
+"<html>Uploading to the server <strong>failed</strong> because your "
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
+"security reasons. This is most likely because you are running<br>in an "
+"applet and because you didn''t load your applet from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
+#, java-format
+msgid ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
+msgid ""
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
+#, java-format
+msgid "<br>Error message(untranslated): {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
+"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
+"preferences and your internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because a primitive you tried "
+"to<br>delete on the server is already deleted.<br><br>The error message is:"
+"<br>{0}</html>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
 #, java-format
@@ -9422,5 +9608,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104
 #, java-format
 msgid ""
@@ -9429,5 +9615,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110
 #, java-format
 msgid ""
@@ -9436,5 +9622,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112
 #, java-format
 msgid ""
@@ -9443,5 +9629,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119
 #, java-format
 msgid ""
@@ -9450,5 +9636,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
 #, java-format
 msgid ""
@@ -9507,40 +9693,39 @@
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
 msgid "Visibility"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 msgid "Defines the visibility of your trace for other OSM users."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
-#, fuzzy
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
 msgstr ""
 
 #. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141
-#: build/trans_presets.java:3145
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3148
 msgid "Description"
 msgstr "תיאור"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
 msgid "Please enter Description about your trace."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
 msgid "Tags (comma delimited)"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
 msgid "Please enter tags about your trace."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:192
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:193
 #, java-format
 msgid "Selected track: {0}"
@@ -9548,47 +9733,47 @@
 
 #. Set progress dialog to indeterminate while connecting
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:215
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:216
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:239
 msgid "Upload cancelled"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:248
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:249
 msgid "Error while uploading"
 msgstr "שגיאה בזמן ההעלאה"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:302
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
 msgid "GPX upload was successful"
 msgstr "GPX הועלה בהצלחה"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
 msgid "Upload failed. Server returned the following message: "
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378
 msgid "No description provided. Please provide some description."
 msgstr "לא סופק שום תיאור. נא לספק תיאור."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:380
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:402
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:381
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:403
 msgid "No GPX layer selected. Cannot upload a trace."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:383
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:384
 msgid "No username provided."
 msgstr "לא סופק שם משתמש."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:386
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:387
 msgid "No password provided."
 msgstr "לא סופקה סיסמא."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:418
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419
 msgid "Uploading GPX Track"
 msgstr ""
@@ -9801,5 +9986,5 @@
 msgstr "תמונות שעדיין לא תויגו"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
 msgid "Correlate images with GPX track"
 msgstr ""
@@ -9813,13 +9998,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:591
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:604
 #, java-format
 msgid ""
@@ -9830,9 +10015,9 @@
 "פורמט מצופה: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605
 msgid "Invalid timezone"
 msgstr "אזור זמן שגוי"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:617
 #, java-format
 msgid ""
@@ -9843,65 +10028,65 @@
 "פורמט מצופה: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618
 msgid "Invalid offset"
 msgstr "היסט שגוי"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:661
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:662
 msgid "GPX Track loaded"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:697
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:698
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:732
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:733
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:797
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:800
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:807
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9909,13 +10094,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
 msgid "Default Values"
 msgstr ""
@@ -9953,5 +10138,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
 msgstr "שגיאה בטעינת קובץ"
@@ -9998,13 +10183,13 @@
 msgstr "בחר מ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10013,13 +10198,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
 #, java-format
 msgid ""
@@ -10129,9 +10314,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
 msgid "Add \"source=...\" to elements?"
 msgstr ""
@@ -10284,7 +10469,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-#, fuzzy
 msgid "Set "
-msgstr "בחר"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -10368,5 +10552,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
 msgid "Blank Layer"
 msgstr "שכבה ריקה"
@@ -11291,18 +11475,18 @@
 msgstr "מצב פריט לא ידוע"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 msgid "Open Visible..."
 msgstr "פתח גלוי..."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
 msgid "Open only files that are visible in current view."
 msgstr "פתח רק קבצים שנראים בתצוגה הנוכחית."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59
 msgid "No view open - cannot determine boundaries!"
 msgstr "אף תצוגה לא פתוחה - לא יכול לקבוע גבולות!"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:114
 #, java-format
 msgid "Unknown file extension: {0}"
@@ -11313,5 +11497,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:94
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:93
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -11320,9 +11504,9 @@
 "Firefox לא נמצא. קבע את קובץ ההרצה של Firefox בדף Map Settings של המאפיינים."
 
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+msgid "osmarender options"
+msgstr ""
+
 #: ../plugins/osmarender/src/OsmarenderPlugin.java:125
-msgid "osmarender options"
-msgstr ""
-
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:126
 msgid "Firefox executable"
 msgstr "קובץ הרצת פיירפוקס"
@@ -11333,28 +11517,33 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#, fuzzy
+msgid "create new objects"
+msgstr "יוצר נקודה חדשה."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "change the selection"
 msgstr "שנה את הבחירה"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the viewport"
 msgstr "שנה נקודת מבט"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "confirm all Remote Control actions manually"
 msgstr "אשר את כל פעולות השלט רחוק ידנית"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "Remote Control"
 msgstr "שלט רחוק"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "Settings for the Remote Control plugin."
 msgstr "כיוונונים לתוסף \"שלט רחוק\""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -11365,28 +11554,35 @@
 "לא זמין בגלל שהוא בשימוש ע\"י יישומים חיצוניים המדהרים עם התוסף."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
 msgid "Permitted actions"
 msgstr "פעולות מורשות"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
 msgid "Remote Control has been asked to load data from the API."
 msgstr "שלט רחוק ביקש להוריד נתונים מה-API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 #, java-format
 msgid "Request details: {0}"
 msgstr "בקש פרטים: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Do you want to allow this?"
 msgstr "האם אתה רוצה לאשר את זה?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
 msgid "Confirm Remote Control action"
 msgstr "אשר פעולת שלט רחוק"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#, fuzzy
+msgid "Remote Control has been asked to create a new node."
+msgstr "שלט רחוק ביקש להוריד נתונים מה-API"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:"
@@ -11877,25 +12073,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+msgid "Enter values for all conflicts."
+msgstr "הזן ערכים לכל ההתנגשויות."
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+msgid "Solve Conflicts"
+msgstr "פתור התנגשויות"
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
 msgid "Join Areas Function"
 msgstr ""
@@ -11967,6 +12171,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 msgid "Validation errors"
 msgstr "שגיאת תקינות"
@@ -11976,10 +12180,10 @@
 msgstr "אין שגיאות תקינות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:165
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
 msgid "Grid"
 msgstr "שריג"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #, java-format
 msgid ""
@@ -12068,51 +12272,65 @@
 msgstr "בודק את תקינות הנתונים"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
 msgid "Data with errors. Upload anyway?"
 msgstr "נתונים עם שגיאות. להעלות בכל זאת?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
 msgid "Open the validation window."
 msgstr "פתח חלון תקינות נתונים."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:89
 msgid "Zoom to problem"
 msgstr "התמקד בבעיה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
 msgid "Fix"
 msgstr "תקן"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
 msgid "Fix the selected errors."
 msgstr "תקן את השגיאות הבחורות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
 msgid "Ignore"
 msgstr "התעלם"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
 msgstr "התעלם מהשגיאות הבחורות בעתיד."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Whole group"
 msgstr "קבוצה שלמה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Single elements"
 msgstr "אלמנטים בודדים"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Nothing"
 msgstr "כלום"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:189
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
 msgid "Ignore whole group or individual elements?"
 msgstr "התעלם מקבוצה שלמה או אלמנטים בודדים?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:190
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
 msgid "Ignoring elements"
 msgstr "מתעלם מאלמנטים"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
+msgid "Fixing errors ..."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
+#, java-format
+msgid "Fixing ({0}/{1}): ''{2}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
+#, fuzzy
+msgid "Updating map ..."
+msgstr "ביטול מחיקת דרך..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12144,7 +12362,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
-#, fuzzy
 msgid "Crossing buildings"
-msgstr "דרכים חוצות"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
@@ -12152,19 +12369,18 @@
 msgstr "דרכים חוצות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
 msgid "Duplicated nodes"
 msgstr "נקודות כפולות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:69
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
 msgid "Nodes at same position"
-msgstr "נקודות עם אותו שם"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
 msgid "Confirmation"
 msgstr ""
@@ -12172,19 +12388,16 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
-#, fuzzy
 msgid "Duplicated ways"
-msgstr "שכפל דרך"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
-#, fuzzy
 msgid ""
 "This test checks that there are no ways with same tags and same node "
 "coordinates."
-msgstr "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
-#, fuzzy
 msgid "Delete duplicate ways"
-msgstr "ייצר דרך משוכפלת"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -12751,5 +12964,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "אירעה שגיאה"
@@ -12833,5 +13046,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200
 msgid ""
 "Couldn't match the entered link or id to the selected service. Please try "
@@ -12839,5 +13052,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201
 msgid "No valid WMS URL or id"
 msgstr ""
@@ -12855,17 +13068,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Start adjusting"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
 msgid "There are currently no WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
 msgid "No layers to adjust"
 msgstr ""
@@ -12906,19 +13119,18 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
-#, fuzzy
 msgid "(deactivated)"
-msgstr "מיושן"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
 #, java-format
 msgid ""
@@ -12929,110 +13141,121 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194
-#, fuzzy
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
 msgid "Invalid URL?"
-msgstr "תאריך שגוי"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Download visible tiles"
 msgstr "הורד משטחים גלויים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
 msgid "Change resolution"
 msgstr "שנה רזולוציה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Reload erroneous tiles"
 msgstr "טען מחדש משטחים פגומים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
 msgid "Save WMS layer to file"
 msgstr "שמור שכבת WMS לקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Load WMS layer from file"
 msgstr "טען שכבת WMS מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
 msgid "File Format Error"
 msgstr "שגיאה בפורמט קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
 msgid "WMS Plugin Preferences"
 msgstr "מאפייני תוסף WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Menu Name"
 msgstr "שם תפריט"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
 msgid "WMS URL"
 msgstr "כתובת WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
 msgid "Menu Name (Default)"
 msgstr "שם תפריט (ברירת מחדל)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
 msgid "WMS URL (Default)"
 msgstr "כתובת WMS (ברירת מחדל)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
 msgid "Enter a menu name and WMS URL"
 msgstr "הזן שם תפריט וכתובת WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 #, fuzzy
-msgid "Copy Selected Default(s)"
-msgstr "העתק ברירת מחדל"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+msgid "Overlap tiles"
+msgstr "שטחים חופפים"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 #, fuzzy
-msgid "Please select at least one row to copy."
-msgstr "אנא בחר לפחות דרך אחת."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154
-msgid "Downloader:"
-msgstr ""
+msgid "% of north:"
+msgstr "צפון"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13399,5 +13622,5 @@
 #: build/trans_presets.java:120 build/trans_presets.java:140
 #: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3143
+#: build/trans_presets.java:1557 build/trans_presets.java:3146
 msgid "Reference"
 msgstr "התייחסות"
@@ -13939,7 +14162,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "asphalt"
-msgstr "בריאות"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -13960,8 +14182,7 @@
 #: build/trans_presets.java:471 build/trans_presets.java:490
 #: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
-#, fuzzy
+#: build/trans_presets.java:1306 build/trans_presets.java:2434
 msgid "metal"
-msgstr "השכרה"
+msgstr ""
 
 #. color heath
@@ -13979,5 +14200,6 @@
 #: build/trans_presets.java:471 build/trans_presets.java:490
 #: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_style.java:3367
+#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_style.java:3367
 msgid "wood"
 msgstr ""
@@ -13990,7 +14212,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "paving_stones"
-msgstr "כרטיסי חניה"
+msgstr ""
 
 #. item "Ways/Track Grade 2" combo "Surface"
@@ -14026,7 +14247,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "pebblestone"
-msgstr "אבני ריצוף"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14037,7 +14257,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "compacted"
-msgstr "לא גמור"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14048,7 +14267,6 @@
 #: build/trans_presets.java:509 build/trans_presets.java:665
 #: build/trans_presets.java:1306
-#, fuzzy
 msgid "grass_paver"
-msgstr "דשא"
+msgstr ""
 
 #: build/trans_presets.java:242 build/trans_presets.java:260
@@ -14242,4 +14460,5 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Amenities/Toilets" combo "Fee"
+#. item "Amenities/Bench" combo "Backrest"
 #. item "Amenities/Hunting Stand" combo "Shelter"
 #. item "Amenities/Hunting Stand" combo "Hide"
@@ -14268,12 +14487,12 @@
 #: build/trans_presets.java:1398 build/trans_presets.java:1399
 #: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2439
-#: build/trans_presets.java:2440 build/trans_presets.java:2441
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2397 build/trans_presets.java:2433
+#: build/trans_presets.java:2442 build/trans_presets.java:2443
+#: build/trans_presets.java:2444 build/trans_presets.java:2714
 msgid "yes"
 msgstr "כן"
 
 #. color permissive
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -14321,5 +14540,5 @@
 
 #. color private
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -14356,5 +14575,5 @@
 #. <rule>
 #. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -14418,6 +14637,7 @@
 #: build/trans_presets.java:1399 build/trans_presets.java:1763
 #: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2439 build/trans_presets.java:2440
-#: build/trans_presets.java:2441 build/trans_presets.java:2711
+#: build/trans_presets.java:2433 build/trans_presets.java:2442
+#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:2714
 msgid "no"
 msgstr "לא"
@@ -14563,6 +14783,6 @@
 #: build/trans_presets.java:788 build/trans_presets.java:1135
 #: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2898 build/trans_presets.java:2908
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2901 build/trans_presets.java:2911
+#: build/trans_presets.java:2920
 msgid "Type"
 msgstr "סוג"
@@ -14833,7 +15053,6 @@
 #. item "Ways/Cycleway" check "Embankment"
 #: build/trans_presets.java:449
-#, fuzzy
 msgid "Pedestrians"
-msgstr "הולכי רגל"
+msgstr ""
 
 #. item "Ways/Cycleway" text "Width (meters)"
@@ -14852,7 +15071,6 @@
 #. item "Ways/Footway" check "Embankment"
 #: build/trans_presets.java:469
-#, fuzzy
 msgid "Bikes"
-msgstr "דוקרנים"
+msgstr ""
 
 #. item "Ways/Footway" text "Width (meters)"
@@ -15144,7 +15362,7 @@
 #: build/trans_presets.java:2384 build/trans_presets.java:2395
 #: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2461 build/trans_presets.java:2509
-#: build/trans_presets.java:2675 build/trans_presets.java:2690
-#: build/trans_presets.java:2729 build/trans_presets.java:3148
+#: build/trans_presets.java:2464 build/trans_presets.java:2512
+#: build/trans_presets.java:2678 build/trans_presets.java:2693
+#: build/trans_presets.java:2732 build/trans_presets.java:3151
 msgid "Operator"
 msgstr "מפעיל"
@@ -15357,6 +15575,6 @@
 #. item "Places/Volcano" text "Name"
 #: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2842
-#: build/trans_presets.java:2849 build/trans_presets.java:2856
+#: build/trans_presets.java:1745 build/trans_presets.java:2845
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
 msgid "Elevation"
 msgstr "הגבהה"
@@ -16268,7 +16486,4 @@
 #. item "Sport Facilities/Miniature Golf" text "Name"
 #. item "Buildings/Library" text "Name"
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
-#. <key key="amenity" value="bench" />
 #. item "Amenities/Baby Hatch" text "Operator"
 #. item "Shops/Supermarket" text "Name"
@@ -16316,23 +16531,23 @@
 #: build/trans_presets.java:1818 build/trans_presets.java:1909
 #: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2433
-#: build/trans_presets.java:2462 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2250 build/trans_presets.java:2465
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
@@ -16356,5 +16571,4 @@
 #. item "Buildings/Library" combo "Opening Hours"
 #. item "Buildings/Place of Worship" combo "Opening Hours"
-#. item "Amenities/Bench" combo "Opening Hours"
 #. item "Shops/Supermarket" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
@@ -16401,22 +16615,22 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "24/7"
 msgstr ""
@@ -16431,22 +16645,22 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -16461,22 +16675,22 @@
 #: build/trans_presets.java:1909 build/trans_presets.java:1915
 #: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2433 build/trans_presets.java:2470
-#: build/trans_presets.java:2476 build/trans_presets.java:2483
-#: build/trans_presets.java:2490 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 build/trans_presets.java:2602
-#: build/trans_presets.java:2608 build/trans_presets.java:2614
-#: build/trans_presets.java:2620 build/trans_presets.java:2626
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2676 build/trans_presets.java:2684
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2713 build/trans_presets.java:2740
+#: build/trans_presets.java:2473 build/trans_presets.java:2479
+#: build/trans_presets.java:2486 build/trans_presets.java:2493
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2560
+#: build/trans_presets.java:2566 build/trans_presets.java:2572
+#: build/trans_presets.java:2578 build/trans_presets.java:2584
+#: build/trans_presets.java:2591 build/trans_presets.java:2598
+#: build/trans_presets.java:2605 build/trans_presets.java:2611
+#: build/trans_presets.java:2617 build/trans_presets.java:2623
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2649
+#: build/trans_presets.java:2656 build/trans_presets.java:2662
+#: build/trans_presets.java:2668 build/trans_presets.java:2679
+#: build/trans_presets.java:2687 build/trans_presets.java:2702
+#: build/trans_presets.java:2708 build/trans_presets.java:2716
+#: build/trans_presets.java:2743
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16510,5 +16724,5 @@
 #: build/trans_presets.java:1391 build/trans_presets.java:1762
 #: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Reference number"
 msgstr ""
@@ -16528,7 +16742,6 @@
 
 #: build/trans_presets.java:1393
-#, fuzzy
 msgid "Park and Ride"
-msgstr "סמן כהושלם"
+msgstr ""
 
 #. item "Tourism/Information Terminal" text "Reference number"
@@ -16756,5 +16969,5 @@
 #. <separator/>
 #: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2442
 msgid "Shelter"
 msgstr "מקלט"
@@ -17139,7 +17352,6 @@
 #. item "Tourism/Map" combo "Detail Grade"
 #: build/trans_presets.java:1720
-#, fuzzy
 msgid "topo"
-msgstr "עצור"
+msgstr ""
 
 #. color tertiary
@@ -17186,23 +17398,19 @@
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "Shown Area"
-msgstr "הורדת איזור"
+msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "site"
-msgstr "הדבק"
+msgstr ""
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "city"
-msgstr "עיר"
+msgstr ""
 
 #: build/trans_presets.java:1721
-#, fuzzy
 msgid "region"
-msgstr "אזור"
+msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -17230,7 +17438,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #: build/trans_presets.java:1727 build/trans_presets.java:1750
-#, fuzzy
 msgid "Mountainbiking"
-msgstr "צעידה הררית"
+msgstr ""
 
 #. item "Tourism/Map" check "Mountainbiking"
@@ -17244,7 +17451,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #: build/trans_presets.java:1729 build/trans_presets.java:1752
-#, fuzzy
 msgid "Riding"
-msgstr "בניין"
+msgstr ""
 
 #. item "Tourism/Map" check "Riding"
@@ -17261,13 +17467,11 @@
 #. item "Tourism/Information Board" text "Name"
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "Board Content"
-msgstr "ביקורת גבולות"
+msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "notice"
-msgstr "מתחילים"
+msgstr ""
 
 #: build/trans_presets.java:1737
@@ -17284,7 +17488,6 @@
 
 #: build/trans_presets.java:1737
-#, fuzzy
 msgid "plants"
-msgstr "שקנאי"
+msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
@@ -17295,19 +17498,16 @@
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
 #: build/trans_presets.java:1755
-#, fuzzy
 msgid "Information Terminal"
-msgstr "מידע"
+msgstr ""
 
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
 #: build/trans_presets.java:1760 build/trans_presets.java:1770
-#, fuzzy
 msgid "Closer description"
-msgstr "תיאור מסלול GPS"
+msgstr ""
 
 #: build/trans_presets.java:1765
-#, fuzzy
 msgid "Audioguide"
-msgstr "שמע"
+msgstr ""
 
 #. <space />
@@ -17318,7 +17518,6 @@
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
 #: build/trans_presets.java:1776
-#, fuzzy
 msgid "Phone number"
-msgstr "מספר טלפון"
+msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
@@ -17642,5 +17841,5 @@
 #. <condition k="sport" v="dog_racing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="leisure/dog.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17674,5 +17873,5 @@
 #. <condition k="sport" v="gymnastics"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/multi.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18798,6 +18997,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "Religion"
 msgstr "דת"
@@ -18806,66 +19005,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3029
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:2248 build/trans_presets.java:3032
+#: build/trans_presets.java:3041
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "Denomination"
 msgstr ""
@@ -18874,76 +19073,76 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3030
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:2249 build/trans_presets.java:3033
+#: build/trans_presets.java:3042
 msgid "sunni"
 msgstr "סוני"
@@ -19275,5 +19474,5 @@
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2511
+#: build/trans_presets.java:2398 build/trans_presets.java:2514
 msgid "Note"
 msgstr ""
@@ -19298,5 +19497,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2512
+#: build/trans_presets.java:2411 build/trans_presets.java:2515
 msgid "Coins"
 msgstr ""
@@ -19304,5 +19503,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2513
+#: build/trans_presets.java:2412 build/trans_presets.java:2516
 msgid "Notes"
 msgstr ""
@@ -19310,5 +19509,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2514
+#: build/trans_presets.java:2413 build/trans_presets.java:2517
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19316,5 +19515,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2515
+#: build/trans_presets.java:2414 build/trans_presets.java:2518
 msgid "Debit cards"
 msgstr ""
@@ -19322,5 +19521,5 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2516
+#: build/trans_presets.java:2415 build/trans_presets.java:2519
 msgid "Credit cards"
 msgstr ""
@@ -19379,10 +19578,143 @@
 msgstr "ספסל"
 
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
+#. <key key="amenity" value="bench" />
+#: build/trans_presets.java:2433
+#, fuzzy
+msgid "Backrest"
+msgstr "חזרה"
+
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Material"
+msgstr "מצבת זיכרון"
+
+#. item "Amenities/Bench" combo "Material"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "stone"
+msgstr "כלום"
+
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "plastic"
+msgstr "מקום"
+
 #: build/trans_presets.java:2435
+#, fuzzy
+msgid "Colour"
+msgstr "צבע"
+
+#. item "Amenities/Bench" combo "Colour"
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "black"
+msgstr "חזרה"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "brown"
+msgstr "למטה"
+
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--landuse tags -->
+#.
+#. <rule>
+#. <condition k="landuse" v="farm"/>
+#. color green
+#. <icon annotate="true" src="misc/landmark/farm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmland"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="meadow"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="vineyard"/>
+#. color forest
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="allotments"/>
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="grass"/>
+#. color cemetery
+#. <icon src="rendering/landuse/cemetery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="village_green"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_presets.java:2435 build/trans_style.java:3055
+#: build/trans_style.java:3063 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3127
+#: build/trans_style.java:3135 build/trans_style.java:3233
+#: build/trans_style.java:3241
+msgid "green"
+msgstr "ירוק"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "red"
+msgstr "סוף"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "blue"
+msgstr "ערך"
+
+#: build/trans_presets.java:2435
+#, fuzzy
+msgid "white"
+msgstr "מים"
+
+#: build/trans_presets.java:2436
+msgid "Amount of Seats"
+msgstr ""
+
+#. item "Amenities/Bench" combo "Amount of Seats"
+#: build/trans_presets.java:2438
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19391,30 +19723,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2438 build/trans_presets.java:2899
+#: build/trans_presets.java:2441 build/trans_presets.java:2902
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2441
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2446
 msgid "Fountain"
 msgstr "מזרקה"
@@ -19423,10 +19755,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -19435,10 +19767,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2456
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Baby Hatch"
 msgstr ""
@@ -19446,34 +19778,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2462
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2468
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2469
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2475
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2473
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "Edit Chemist"
-msgstr "ערוך עיר"
-
-#: build/trans_presets.java:2478
+msgstr ""
+
+#: build/trans_presets.java:2481
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -19481,9 +19812,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2483
 msgid "Edit Convenience Store"
 msgstr "ערוך מכולת"
 
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2488
 msgid "Kiosk"
 msgstr "קיוסק"
@@ -19491,29 +19822,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2490
 msgid "Edit Kiosk"
 msgstr "ערוך קיוסק"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2495
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2493
-#, fuzzy
+#: build/trans_presets.java:2496
 msgid "Edit Book Store"
-msgstr "ערוך נחל"
-
-#: build/trans_presets.java:2498
+msgstr ""
+
+#: build/trans_presets.java:2501
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2499
-#, fuzzy
+#: build/trans_presets.java:2502
 msgid "Edit Travel Agency"
-msgstr "ערוך עץ"
-
-#: build/trans_presets.java:2504
+msgstr ""
+
+#: build/trans_presets.java:2507
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -19521,5 +19850,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -19527,88 +19856,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2511
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2520
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2522
 msgid "Butcher"
 msgstr "קצבייה"
@@ -19616,9 +19945,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2524
 msgid "Edit Butcher"
 msgstr "ערוך קצבייה"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2529
 msgid "Baker"
 msgstr "מאפייה"
@@ -19626,9 +19955,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2531
 msgid "Edit Baker"
 msgstr "ערוך מאפייה"
 
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2536
 msgid "Florist"
 msgstr "פרחים"
@@ -19636,18 +19965,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2538
 msgid "Edit Florist"
 msgstr "ערוך חנות פרחים"
 
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2543
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2544
 msgid "Edit Organic Shop"
 msgstr "ערוך חנות אורגנית"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2549
 msgid "Alcohol"
 msgstr ""
@@ -19655,54 +19984,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2551
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2553
+#: build/trans_presets.java:2556
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2557
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2562
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2563
 msgid "Edit Computer Shop"
 msgstr "ערוך חנות מחשבים"
 
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2569
 msgid "Edit Electronics Shop"
 msgstr "ערוך חנות אלקטרוניקה"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2574
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2575
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2580
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2581
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Garden Centre"
 msgstr ""
@@ -19710,9 +20039,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2588
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2593
 msgid "Hardware"
 msgstr ""
@@ -19720,9 +20049,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2595
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Do-it-yourself-store"
 msgstr "חנות עשה-זאת-בעצמך"
@@ -19730,54 +20059,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2602
 msgid "Edit Do-it-yourself-store"
 msgstr "ערוך חנות עשה-זאת-בעצמך"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2608
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Hairdresser"
 msgstr "מספרה"
 
 #. item
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2614
 msgid "Edit Hairdresser"
 msgstr "ערוך מספרה"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2620
 msgid "Edit Shoe Shop"
 msgstr "ערוך חנות נעליים"
 
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2626
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2631
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2632
 msgid "Edit Video Shop"
 msgstr "ערוך חנות וידאו"
 
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2637
 msgid "Dry Cleaning"
 msgstr "ניקוי יבש"
@@ -19785,9 +20114,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2639
 msgid "Edit Dry Cleaning"
 msgstr "ערוך ניקוי יבש"
 
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2644
 msgid "Laundry"
 msgstr "מכבסה"
@@ -19795,9 +20124,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2646
 msgid "Edit Laundry"
 msgstr "ערוך מכבסה"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2651
 msgid "Outdoor"
 msgstr ""
@@ -19805,32 +20134,32 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2653
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2658
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2659
 msgid "Edit Sports Shop"
 msgstr "ערוך חנות ספורט"
 
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2664
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2665
 msgid "Edit Optician"
 msgstr "ערוך אופטיקאי"
 
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2672
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2673
 msgid "Bank"
 msgstr "בנק"
@@ -19838,14 +20167,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2675
 msgid "Edit Bank"
 msgstr "ערוך בנק"
 
-#: build/trans_presets.java:2677 build/trans_presets.java:2686
+#: build/trans_presets.java:2680 build/trans_presets.java:2689
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2682
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -19853,5 +20182,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2684
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -19859,15 +20188,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2691
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2696
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2697
 msgid "Doctors"
 msgstr "רופאים"
@@ -19875,18 +20204,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2699
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2704
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2705
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2710
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -19894,5 +20223,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2712
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -19900,9 +20229,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2714
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2718
 msgid "Hospital"
 msgstr "בית חולים"
@@ -19910,10 +20239,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2720
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2724
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -19922,5 +20251,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2727
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -19929,20 +20258,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2730
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2731
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2733
 msgid "Phone Number"
 msgstr "מספר טלפון"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2734
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -19950,5 +20279,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2737
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -19957,55 +20286,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2740
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
 #. group "Places"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2748
 msgid "Continent"
 msgstr "יבשת"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2749
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2754
 msgid "Country"
 msgstr "ארץ"
 
 #. item
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2755
 msgid "Edit Country"
 msgstr "ערוך ארץ"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2760
 msgid "State"
 msgstr "מדינה"
 
 #. item
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2761
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2766
 msgid "Region"
 msgstr "אזור"
 
 #. item
-#: build/trans_presets.java:2764
+#: build/trans_presets.java:2767
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2772
 msgid "County"
 msgstr "מחוז"
 
 #. item
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2773
 msgid "Edit County"
 msgstr "ערוך מחוז"
@@ -20013,15 +20342,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2779
 msgid "City"
 msgstr "עיר"
 
 #. item
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2780
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2785
 msgid "Town"
 msgstr "עיירה"
@@ -20029,10 +20358,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2787
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2792
 msgid "Suburb"
 msgstr "פרבר"
@@ -20040,25 +20369,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2794
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2799
 msgid "Village"
 msgstr "כפר"
 
 #. item
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2800
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2805
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2806
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
@@ -20066,5 +20395,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2812
 msgid "Locality"
 msgstr "מקומיות"
@@ -20072,10 +20401,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2814
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2819
 msgid "Island"
 msgstr "אי"
@@ -20083,24 +20412,22 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2821
 msgid "Edit Island"
 msgstr "ערוך אי"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2823
-#, fuzzy
+#: build/trans_presets.java:2826
 msgid "Islet"
-msgstr "שמאלה"
+msgstr ""
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2825
-#, fuzzy
+#: build/trans_presets.java:2828
 msgid "Edit Islet"
-msgstr "ערוך טירה"
+msgstr ""
 
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2834
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -20108,10 +20435,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2836
 msgid "Edit Cave Entrance"
 msgstr "ערוך פתח מערה"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2840
 msgid "Peak"
 msgstr "פסגה"
@@ -20119,10 +20446,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2842
 msgid "Edit Peak"
 msgstr "ערוך פסגה"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2847
 msgid "Glacier"
 msgstr "קרחון"
@@ -20130,10 +20457,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2849
 msgid "Edit Glacier"
 msgstr "ערוך קרחון"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2854
 msgid "Volcano"
 msgstr "הר געש"
@@ -20141,70 +20468,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2856
 msgid "Edit Volcano"
 msgstr "ערוך הר געש"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2862
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2863
 msgid "National"
 msgstr "לאומי"
 
 #. item
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2864
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2869
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2870
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2875
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2876
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2881
 msgid "Political"
 msgstr "פוליטי"
 
 #. item
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2882
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2887
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2888
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2894
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2895
 msgid "Tree"
 msgstr "עץ"
@@ -20213,15 +20540,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2898
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2903
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2905
 msgid "Wood"
 msgstr "חורש"
@@ -20230,5 +20557,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2908
 msgid "Edit Wood"
 msgstr "ערוך חורש"
@@ -20236,17 +20563,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:2908 build/trans_presets.java:2917
+#: build/trans_presets.java:2911 build/trans_presets.java:2920
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2913
 msgid "Forest"
 msgstr "יער"
@@ -20255,14 +20582,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2916
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2922
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2923
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -20270,25 +20597,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2928
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2929
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2933
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2934
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2938
 msgid "Fell"
 msgstr ""
@@ -20296,10 +20623,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2940
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2944
 msgid "Heath"
 msgstr "שדה-בור"
@@ -20307,5 +20634,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2946
 msgid "Edit Heath"
 msgstr "ערוך שדה-בור"
@@ -20313,5 +20640,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2951
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -20320,45 +20647,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2954
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2959
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2960
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2965
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:2966
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2971
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2972
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2977
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2978
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -20366,25 +20693,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2984
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2985
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2989
 msgid "Grass"
 msgstr "דשא"
 
 #. item
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2990
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2995
 msgid "Village Green"
 msgstr ""
@@ -20392,10 +20719,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:2997
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3002
 msgid "Common"
 msgstr ""
@@ -20403,20 +20730,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3004
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3008
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3009
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3013
 msgid "Recreation Ground"
 msgstr ""
@@ -20424,5 +20751,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:3015
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -20430,15 +20757,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3021
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3022
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:3027
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -20446,9 +20773,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3029
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3035
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -20456,39 +20783,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3037
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3044
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3045
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3050
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3051
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3056
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3057
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3062
 msgid "Railway land"
 msgstr ""
@@ -20496,15 +20823,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3064
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3069
 msgid "Military"
 msgstr "צבאי"
 
 #. item
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3070
 msgid "Edit Military Landuse"
 msgstr ""
@@ -20512,55 +20839,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3076
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3077
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3082
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3083
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3088
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3089
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3094
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3095
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3100
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3101
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3110
 msgid "Multipolygon"
 msgstr ""
@@ -20570,5 +20897,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3114
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20577,10 +20904,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3120
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3121
 msgid "inner segment"
 msgstr ""
@@ -20588,5 +20915,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3124
 msgid "Turn restriction"
 msgstr ""
@@ -20595,5 +20922,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3127
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -20601,34 +20928,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3129
 msgid "only_straight_on"
 msgstr ""
@@ -20637,15 +20964,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3134
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3135
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3136
 msgid "to way"
 msgstr ""
@@ -20653,5 +20980,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3139
 msgid "Route"
 msgstr ""
@@ -20660,5 +20987,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3142
 msgid "Edit Route"
 msgstr ""
@@ -20666,5 +20993,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "Route type"
 msgstr ""
@@ -20672,5 +20999,5 @@
 #. item "Relations/Route" combo "Route type"
 #. color destination
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -20736,5 +21063,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3141 build/trans_style.java:233
+#: build/trans_presets.java:3144 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -20743,17 +21070,17 @@
 msgstr "אופניים"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "ski"
 msgstr ""
@@ -20806,5 +21133,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3141 build/trans_style.java:247
+#: build/trans_presets.java:3144 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -20813,13 +21140,13 @@
 msgstr "רגל"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3144
 msgid "detour"
 msgstr ""
@@ -20833,10 +21160,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3141 build/trans_style.java:1206
+#: build/trans_presets.java:3144 build/trans_style.java:1206
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3147
 msgid "Symbol description"
 msgstr ""
@@ -20844,31 +21171,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3150
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3152
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3153
 msgid "Color (hex)"
 msgstr ""
@@ -20877,30 +21204,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3156
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3157
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3158
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3159
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3160
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3161
 msgid "backward halt point"
 msgstr ""
@@ -24053,76 +24380,4 @@
 msgstr "היסטורי"
 
-#. color historic
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!--landuse tags -->
-#.
-#. <rule>
-#. <condition k="landuse" v="farm"/>
-#. color green
-#. <icon annotate="true" src="misc/landmark/farm.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="farmland"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="meadow"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="vineyard"/>
-#. color forest
-#. <icon src="misc/landmark/trees.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="allotments"/>
-#. color green
-#. <icon src="misc/landmark/plant.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="grass"/>
-#. color cemetery
-#. <icon src="rendering/landuse/cemetery.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="village_green"/>
-#. color green
-#. <icon src="leisure/common.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3055 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3127 build/trans_style.java:3135
-#: build/trans_style.java:3233 build/trans_style.java:3241
-msgid "green"
-msgstr "ירוק"
-
 #. color green
 #. <icon annotate="true" src="shop/groceries/fruits.png"/>
@@ -25090,9 +25345,82 @@
 msgstr ""
 
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "בחר דרכים עם זווית כמעט ישרה ליישור"
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
+#. only for Czech Republic
+#: build/trans_wms.java:25
+msgid "Czech CUZK:KM"
+msgstr ""
+
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:26
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
+
+#~ msgid "All the ways were empty"
+#~ msgstr "כל הדרכים היו ריקות"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "למזג צמתים בעלי חברויות שונות?"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "מזג בכל זאת"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?"
+
+#~ msgid "Unknown version"
+#~ msgstr "גרסה לא ידוע"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "נמצא <nd> שלא בתוך דרך."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "ל <nd> אין התייחסות (ref)"
+
+#~ msgid "Move"
+#~ msgstr "הזז"
+
+#~ msgid "Data Layer"
+#~ msgstr "שכבת נתונים"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "סיומת הקובץ אינה ידועה."
+
+#~ msgid "Email"
+#~ msgstr "דוא\"ל"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "פתור התנגשויות"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "ארעו התנגשויות במהלך הייבוא."
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
+
+#~ msgid "their version:"
+#~ msgstr "הגירסה שלהם:"
+
+#~ msgid "resolved version:"
+#~ msgstr "הגירסה הפתורה:"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "קיימות התנגשויות עם פריט {0}:"
+#~ msgstr[1] "קיימות התנגשויות עם {0} פריטים:"
+
+#~ msgid "my version:"
+#~ msgstr "הגירסה שלי:"
+
+#~ msgid "Object"
+#~ msgstr "פריט"
+
+#~ msgid "unnamed"
+#~ msgstr "ללא שם"
 
 #~ msgid ""
@@ -25103,87 +25431,4 @@
 #~ "תקלה."
 
-#~ msgid "No document open so nothing to save."
-#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "מחק {1}{0}"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
-
-#~ msgid "nodes"
-#~ msgstr "נקודות"
-
-#~ msgid "ways"
-#~ msgstr "דרכים"
-
-#~ msgid "relations"
-#~ msgstr "יחסים"
-
-#~ msgid "Delete Layer"
-#~ msgstr "מחק שכבה"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "מחברים: {0}"
-
-#~ msgid "Public"
-#~ msgstr "ציבורי"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr "נסיוני. שמור את עבודתך וודא לפני העלאה."
-
-#~ msgid "Continue anyway"
-#~ msgstr "המשך בכל זאת"
-
-#~ msgid "map"
-#~ msgstr "מפה"
-
-#~ msgid "citymap"
-#~ msgstr "מפת עיר"
-
-#~ msgid "hikingmap"
-#~ msgstr "מפת צעידה"
-
-#~ msgid "bicyclemap"
-#~ msgstr "מפת רכיבה"
-
-#~ msgid "Move"
-#~ msgstr "הזז"
-
-#~ msgid "Data Layer"
-#~ msgstr "שכבת נתונים"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "סיומת הקובץ אינה ידועה."
-
-#~ msgid "Email"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "פתור התנגשויות"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "ארעו התנגשויות במהלך הייבוא."
-
-#~ msgid "their version:"
-#~ msgstr "הגירסה שלהם:"
-
-#~ msgid "resolved version:"
-#~ msgstr "הגירסה הפתורה:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "קיימות התנגשויות עם פריט {0}:"
-#~ msgstr[1] "קיימות התנגשויות עם {0} פריטים:"
-
-#~ msgid "my version:"
-#~ msgstr "הגירסה שלי:"
-
-#~ msgid "Object"
-#~ msgstr "פריט"
-
-#~ msgid "unnamed"
-#~ msgstr "ללא שם"
-
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -25227,4 +25472,7 @@
 #~ msgstr "תאריך"
 
+#~ msgid "Authors: {0}"
+#~ msgstr "מחברים: {0}"
+
 #~ msgid "OSM username (email)"
 #~ msgstr "שם משתמש OSM (אי-מייל)"
@@ -25244,4 +25492,7 @@
 #~ msgid "Change"
 #~ msgstr "שנה"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "מחק {1}{0}"
 
 #~ msgid "position"
@@ -25297,6 +25548,6 @@
 #~ msgstr "בדוק תקינות"
 
-#~ msgid "end"
-#~ msgstr "סוף"
+#~ msgid "Public"
+#~ msgstr "ציבורי"
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -25328,7 +25579,4 @@
 #~ msgstr "בסיסי"
 
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס"
-
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה."
@@ -25336,4 +25584,7 @@
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n"
+
+#~ msgid "Delete Layer"
+#~ msgstr "מחק שכבה"
 
 #~ msgid ""
@@ -25351,9 +25602,27 @@
 #~ msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?"
 
+#~ msgid "Continue anyway"
+#~ msgstr "המשך בכל זאת"
+
+#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
+#~ msgstr "נסיוני. שמור את עבודתך וודא לפני העלאה."
+
+#~ msgid "citymap"
+#~ msgstr "מפת עיר"
+
+#~ msgid "hikingmap"
+#~ msgstr "מפת צעידה"
+
+#~ msgid "map"
+#~ msgstr "מפה"
+
+#~ msgid "bicyclemap"
+#~ msgstr "מפת רכיבה"
+
 #~ msgid "sports"
 #~ msgstr "ספורט"
 
-#~ msgid "Undeleting Way..."
-#~ msgstr "ביטול מחיקת דרך..."
+#~ msgid "Please select ways with almost right angles to orthogonalize."
+#~ msgstr "בחר דרכים עם זווית כמעט ישרה ליישור"
 
 #~ msgid "Checking whether node {0} is gone ..."
@@ -25374,4 +25643,13 @@
 #~ msgid "Selection too big"
 #~ msgstr "בחירה גדולה מידי"
+
+#~ msgid "nodes"
+#~ msgstr "נקודות"
+
+#~ msgid "relations"
+#~ msgstr "יחסים"
+
+#~ msgid "ways"
+#~ msgstr "דרכים"
 
 #~ msgid ""
@@ -25395,2 +25673,5 @@
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "עורך יחסים: {0}"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת."
