Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 14252)
+++ applications/editors/josm/i18n/po/ar.po	(revision 14372)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-24 16:37+0100\n"
-"PO-Revision-Date: 2009-03-09 19:20+0000\n"
+"POT-Creation-Date: 2009-03-31 16:58+0200\n"
+"PO-Revision-Date: 2009-03-30 18:05+0000\n"
 "Last-Translator: metehyi <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2009-03-24 15:25+0000\n"
+"X-Launchpad-Export-Date: 2009-03-31 14:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -27,5 +27,5 @@
 #. FIXME why is help not a JosmAction?
 #: ../core/src/org/openstreetmap/josm/Main.java:195
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296
@@ -80,5 +80,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
@@ -93,6 +93,7 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
 msgid "Cancel"
@@ -147,5 +148,5 @@
 #, java-format
 msgid "Last change at {0}"
-msgstr "آخر تغيير عند {0}"
+msgstr "آخر تغيير في {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
@@ -156,5 +157,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
 msgid "Homepage"
-msgstr "صَّفحة الإنترنت"
+msgstr "صفحة الإنترنت"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
@@ -209,9 +210,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -272,4 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -280,5 +282,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
@@ -301,9 +303,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123
 msgid "Align Nodes in Line"
-msgstr "صفّ العقد في خطّ جالس"
+msgstr "صفّ العقد في خطّ مستقيم"
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 msgid "Move the selected nodes in to a line."
-msgstr "حرك العقد المختارة إلى خط جالس."
+msgstr "حرك العقد المختارة إلى خط مستقيم."
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59
@@ -404,6 +406,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
 msgid "Enter values for all conflicts."
 msgstr "ادخل القيم لكل التناقضات."
@@ -411,5 +413,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "حلل التناقضات"
@@ -430,14 +432,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36
 msgid "Copy"
 msgstr "إنسَخ"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
 msgid "Copy selected objects to paste buffer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:125
+msgstr "أنسخ الأغراض المختارة إلى وسيط الإلصاق."
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:133
 msgid "Please select something to copy."
 msgstr "الرجاء إختيار شيء ما للنسخ."
@@ -472,4 +474,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:216
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
@@ -508,5 +512,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download from OSM..."
-msgstr "نزّل من JOSM..."
+msgstr "نزّل من أو.أس.أم"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
@@ -589,5 +593,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79
 msgid "gps track description"
-msgstr ""
+msgstr "وصف أثر جهاز تحديد المواقع العالمي"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85
@@ -660,11 +664,11 @@
 msgstr "المساعدة على الخط لِــJOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
 msgid "Open in Browser"
 msgstr "إفتح في المتصفح"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
@@ -673,10 +677,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
 msgid "Edit"
 msgstr "حرّر"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
@@ -685,19 +691,19 @@
 msgstr "أعد التحميل"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "خطء عند تحميل الصفحة {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
 msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:210
+msgstr "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\">الإنكليزية</A>."
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
 #, java-format
 msgid ""
@@ -705,4 +711,6 @@
 "\">your language</A>."
 msgstr ""
+"صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\"> الإنكليزية</A> أو <A HREF="
+"\"{1}\">بِلغتك</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:25
@@ -967,11 +975,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:80
+msgid "Paste Tags"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:58
-msgid "Paste Tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
@@ -1002,5 +1010,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63
 msgid "Rename layer"
-msgstr "غيّر إسم التبقة"
+msgstr "غيّر إسم الطبقة"
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
@@ -1222,5 +1230,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
 msgid "Draw lines between raw gps points."
 msgstr "أرسم خطوط بين نقاط جهاز نظام تحديد المواقع العالمي."
@@ -1495,5 +1502,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78
 msgid "Raw GPS data"
-msgstr "معطيات جهاز نظام تحديد المواقع العالمي خام"
+msgstr "المعطيات الخام لجهاز نظام تحديد المواقع العالمي"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
@@ -1574,29 +1581,29 @@
 msgstr "مُنتقى"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:335
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336
 msgid "Cannot add a node outside of the world."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
 msgid "Add node"
 msgstr "أضافة عقدة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:491
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
 msgid "Add node into way"
 msgstr "إضافة عقدة إلى طريق"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:496
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:498
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
 msgid "Add a new node to an existing way"
 msgstr "إضافة عقدة جديدة إلى طريق موجودة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:879
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
 msgid "Create new node."
 msgstr "انشئ عقدة جديدة"
@@ -1604,6 +1611,6 @@
 #. We already know oldHighlights is not empty, but shift is pressed.
 #. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:891
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
 msgid "Insert new node into way."
@@ -1612,14 +1619,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:889
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
 msgid "Select node under cursor."
 msgstr "إختر العقدة الموجودة تحت المزلاق."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:900
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Start new way from last node."
 msgstr "إبدء طريق جديدة من العقدة الأخيرة."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903
 msgid "Continue way from last node."
 msgstr "تابع طريق من العقدة الأخيرة."
@@ -1852,9 +1859,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+msgid "CS"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "CI"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid "CS"
 msgstr ""
 
@@ -1913,4 +1920,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:273
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:61
@@ -2037,5 +2046,5 @@
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
 msgid "Sequence"
-msgstr "التسلسل"
+msgstr "التعاقب"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -2212,5 +2221,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:119
 msgid "highway"
-msgstr "طريق سريع"
+msgstr "من النوع طريق"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
@@ -2456,4 +2465,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:95
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
 msgid "Key"
 msgstr "المفتاح"
@@ -2465,4 +2476,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
 msgid "Value"
 msgstr "القيمة"
@@ -2665,6 +2679,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
 msgid "Presets"
-msgstr "التعييناة المسبقة"
+msgstr "التعيينات المسبقة"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
@@ -2689,9 +2704,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242
 msgid "Full Screen"
-msgstr ""
+msgstr "ملء الشاشة"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
 msgid "Toggle Full Screen view"
-msgstr ""
+msgstr "أقلب عرض ملء الشاشة"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283
@@ -2807,5 +2822,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
 msgid "Command Stack"
-msgstr "كدس الأوامر"
+msgstr "تكدس الأوامر"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -2825,4 +2840,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -2833,5 +2849,5 @@
 #, java-format
 msgid "Command Stack: {0}"
-msgstr "كدس الأوامر: {0}"
+msgstr "تكدس الأوامر: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
@@ -3148,4 +3164,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65
 msgid "Remove"
 msgstr "أزِل"
@@ -3366,5 +3383,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:226
 msgid "Download area ok, size probably acceptable to server"
-msgstr "مساحة ممكن تنزيلها، ذات حجم مقبول من الخادم"
+msgstr "هذه المساحة ممكن تنزيلها، القياس مقبول من الخادم"
 
 #. SAXException does not chain correctly
@@ -3583,5 +3600,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:436
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
 msgid "JPEG images (*.jpg)"
@@ -3619,5 +3636,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:109
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217
@@ -3625,30 +3642,30 @@
 msgstr "نقطة gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 msgid "Use global settings."
 msgstr "إستعمل الإعدادات العامة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
 msgid "Draw lines between points for this layer."
 msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
 msgid "Do not draw lines between points for this layer."
 msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Select line drawing options"
 msgstr "حدد خيارات رسم الخطوط"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
@@ -3656,13 +3673,14 @@
 msgstr "خصّص اللون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
 msgstr "مُوافق"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
@@ -3671,5 +3689,5 @@
 msgstr "الغيابي"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -3678,31 +3696,31 @@
 msgstr "إختر لون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Import Audio"
 msgstr "إستورد صوت مسجل"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202
 msgid "Wave Audio files (*.wav)"
 msgstr "ملفات صوتيت (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "العلامات الصوتية من {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232
 msgid "Import images"
 msgstr "إستورد صور"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302
 #, java-format
 msgid "{0} track, "
@@ -3711,5 +3729,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303
 #, java-format
 msgid "{0} route, "
@@ -3718,5 +3736,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
 #, java-format
 msgid "{0} waypoint"
@@ -3725,28 +3743,28 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308
 #, java-format
 msgid "Name: {0}"
 msgstr "الإسم: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
 #, java-format
 msgid "Description: {0}"
 msgstr "الوصف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:328
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
 msgid "Timespan: "
 msgstr "الفترة الزمنية "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342
 msgid "Length: "
 msgstr "الطول: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:653
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:650
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 msgid ""
@@ -3754,11 +3772,13 @@
 "<br>If you want to upload traces, look here:"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:651
+"<html>إنّ تحميل معطيات جهاز تحديد المواقع العالمي غير المعالجة مسبقاً قد تكون "
+"مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:671
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
@@ -3769,29 +3789,29 @@
 msgstr "محوّل من: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:803
 msgid "Download from OSM along this track"
 msgstr "نزّل من OSM على طول هذا المسلك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
 msgid "Download everything within:"
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:701
 #, java-format
 msgid "{0} meters"
 msgstr "{0} أمتار"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704
 msgid "Maximum area per request:"
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
 #, java-format
 msgid ""
@@ -3800,9 +3820,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:873
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1013
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -3810,5 +3830,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1024
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -4008,4 +4028,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
@@ -4015,4 +4036,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
 msgid "Please select the row to edit."
@@ -4020,4 +4042,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:159
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
 #, java-format
 msgid "New value for {0}"
@@ -4993,5 +5016,5 @@
 #, java-format
 msgid "Paint style {0}: {1}"
-msgstr "زيّ الدهن {0}:{1}"
+msgstr "نوع   الطلاء   {0}:{1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
@@ -5025,21 +5048,38 @@
 msgstr "الألوان"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../plugins/terracer/src/terracer/TerracerAction.java:422
+#: ../plugins/terracer/src/terracer/TerracerAction.java:440
+#: ../plugins/terracer/src/terracer/TerracerAction.java:504
+msgid "All"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#, fuzzy
+msgid "Local files"
+msgstr "محلة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#, fuzzy
+msgid "None"
+msgstr "ملاحظات"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Draw large GPS points."
 msgstr "أرسم نقاط عريضة لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "Velocity (red = slow, green = fast)"
 msgstr "السرعة ( أحمر = بطيء، أخضر= سريع)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "ضوبان الموقع (أحمر=عالي،أخضر=منخفض، عندما تكون متوفرة)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -5047,5 +5087,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:1353
 msgid "Car"
@@ -5067,5 +5107,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
 #: build/trans_presets.java:836 build/trans_presets.java:845
@@ -5106,5 +5146,5 @@
 #. item "Barriers/Entrance" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
 #: build/trans_presets.java:835 build/trans_presets.java:844
@@ -5118,77 +5158,77 @@
 msgstr "المشي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw Direction Arrows"
 msgstr "أرسم أسهم الإتجاه"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
 msgid "Fast drawing (looks uglier)"
 msgstr "رسم سريع ( أقل جودة)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "Only on the head of a way."
 msgstr "فقط على رأس الطريق."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
-msgid ""
-"If your gps device draws too few lines, select this to draw lines along your "
-"way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
+#, fuzzy
+msgid "Draw lines between raw GPS points"
+msgstr "أرسم خطوط بين نقاط جهاز نظام تحديد المواقع العالمي."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96
 msgid "Maximum length (meters)"
 msgstr "الطول الأقصى (أمتار)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
+"أرسم سهام الإتجاه حسب البحث في الجدول بدلاً عن إستعمال الرياضيات الصعبة."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -5196,13 +5236,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid "Minimum distance (pixels)"
 msgstr "المسافة الأدنى (نقاط)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:132
 msgid "Draw larger dots for the GPS points."
 msgstr "أرسم نقاط أكبر لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -5210,9 +5250,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:160
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -5220,46 +5260,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:166
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
 msgid "Track and Point Coloring"
 msgstr "تلوين الأثر و النقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180
 msgid "GPS Points"
 msgstr "نقاط جهاز تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:215
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "OSM Data"
 msgstr "المعطيات OSM"
@@ -5396,5 +5436,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
 msgid "Enable proxy server"
-msgstr ""
+msgstr "تمكين خادم التوكيل"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
@@ -5483,5 +5523,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
 msgid "Enable built-in defaults"
-msgstr ""
+msgstr "تمكين الغيابيات المبيتة"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
@@ -5693,4 +5733,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:558
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -6228,4 +6271,28 @@
 msgstr "(تلميحة: يمكنك تحرير المختصرات في التفضيلات)"
 
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+#, fuzzy
+msgid "Create grid of ways"
+msgstr "أنشئ مساحات"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+msgid ""
+"Forms a grid of ways in base to two existing that have various nodes and one "
+"in common"
+msgstr ""
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
+msgid "Select two ways with a node in common"
+msgstr ""
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
+msgid "Select two ways with alone a node in common"
+msgstr ""
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
+#, fuzzy
+msgid "Create a grid of ways"
+msgstr "أنشئ مساحات"
+
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
 msgid "Upload Trace"
@@ -6257,4 +6324,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229
 msgid "Tags"
 msgstr ""
@@ -6275,5 +6343,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:201
 msgid "Upload cancelled"
-msgstr ""
+msgstr "تمّ إلغاء التحميل"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:211
@@ -6628,15 +6696,15 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:428
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433
 msgid "No image"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:438
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443
 #, java-format
 msgid "Loading {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:440
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:467
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:445
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:472
 #, java-format
 msgid "Error on file {0}"
@@ -6731,9 +6799,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
 msgid "Enable automatic caching."
-msgstr ""
+msgstr "تمكين الإخباء التلقائي"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
 msgid "Max. cache size (in MB)"
-msgstr ""
+msgstr "حجم الخابية الأقصى (م. بايت)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55
@@ -6891,5 +6959,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19
 msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgstr "حمّل الموقع من الخابية ( فقط عند تمكين الخابية)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
@@ -6903,5 +6971,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38
 msgid "Open a layer first (GPX, OSM, cache)"
-msgstr ""
+msgstr "إفتح طبقة  أولاً ( جي بي إكس، أو أس أم ، خابية)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
@@ -6925,9 +6993,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
 msgid "Reset cookie"
-msgstr ""
+msgstr "إستعادة كعكة الإنترنت"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
 msgid "Get a new cookie (session timeout)"
-msgstr ""
+msgstr "أطلب كعكة إنترنت جديدة (إنتهاء مهلة الجلسة)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58
@@ -7019,5 +7087,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527
 msgid "Cache Format Error"
-msgstr ""
+msgstr "خطء في صيغة المعطيات"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:542
@@ -7347,5 +7415,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
 msgid "Looking for shoreline..."
-msgstr ""
+msgstr "جاري البحث عن خط الشاطئ"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145
@@ -7366,5 +7434,5 @@
 #, java-format
 msgid "Error creating cache directory: {0}"
-msgstr ""
+msgstr "خطء حين إنشاء مجلد الخابية: {0}"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
@@ -7374,5 +7442,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
 msgid "checking cache..."
-msgstr ""
+msgstr "جاري فحص الخابية..."
 
 #. *
@@ -7543,9 +7611,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "Maximum cache size (MB)"
-msgstr ""
+msgstr "حجم الخابية الأقصى (م. بايت)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache age (days)"
-msgstr ""
+msgstr "عُمر الخابية الأقصى (أيام)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
@@ -7606,9 +7674,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr ""
+msgstr "الحجم الأقصى لكل مجلد خابية بلــبايت. الحجم الغيابي هو 300 م. بايت"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum age of each cached file in days. Default is 100"
-msgstr ""
+msgstr "العُمر الأقصى لكل مجلد خابية بلــبايت. العُمر الغيابي هو 100 يوم"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
@@ -7762,25 +7830,4 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36
 msgid "Measurements"
-msgstr ""
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
-msgid "Navigate"
-msgstr ""
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Navigator"
-msgstr ""
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for routing. Middle mouse button to reset."
-msgstr ""
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:41
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:45
-msgid "Navigation"
-msgstr ""
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:48
-msgid "Reset Graph"
 msgstr ""
 
@@ -7964,4 +8011,97 @@
 msgstr ""
 
+#. Add routing layer
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
+msgid "Navigation"
+msgstr ""
+
+#. TODO Use constructor with shortcut
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#, fuzzy
+msgid "Routing"
+msgstr "أطلال"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add route nodes."
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move route nodes."
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+#, fuzzy
+msgid "Remove route nodes"
+msgstr "أزل المختارة"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
+#, fuzzy
+msgid "Open a list of routing nodes"
+msgstr "إفتح لائحة بكل العلاقات."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
+#, fuzzy
+msgid "Start routing"
+msgstr "محطة"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
+#, fuzzy
+msgid "Criteria"
+msgstr "متوسط"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
+#, fuzzy
+msgid "Shortest"
+msgstr "أحذية"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
+#, fuzzy
+msgid "Fastest"
+msgstr "أسرع"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
+#, fuzzy
+msgid "Reverse route"
+msgstr "أعكس إتجاه الطرقات"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
+#, fuzzy
+msgid "Clear route"
+msgstr "طريق"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#, fuzzy
+msgid "Routing Plugin Preferences"
+msgstr "تفضيلات إختصارات لوحة المفاتيح"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#, fuzzy
+msgid "Configure routing preferences."
+msgstr "تفضيلات إختصارات لوحة المفاتيح"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#, fuzzy
+msgid "Highway type"
+msgstr "من النوع طريق"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+msgid "Speed (Km/h)"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#, fuzzy
+msgid "Weight"
+msgstr "إلى اليمين"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+msgid "Enter weight values"
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
 msgid "Slippy Map"
@@ -8106,4 +8246,83 @@
 msgid "end"
 msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
+#, fuzzy
+msgid "Edit tags"
+msgstr "حرّر دولة/ولاية"
+
+#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
+msgid "Launches the tag editor dialog"
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+msgid "JOSM Tag Editor Plugin"
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
+#, fuzzy
+msgid "(none)"
+msgstr "عقدة"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
+msgid "Highlight"
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
+#, fuzzy
+msgid "<multiple>"
+msgstr "متعدد"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
+#, java-format
+msgid "Remove old keys from up to {0} object"
+msgid_plural "Remove old keys from up to {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
+#, java-format
+msgid "Updating properties of up to {0} object"
+msgid_plural "Updating properties of up to {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
+#, fuzzy
+msgid "Group"
+msgstr "طريق"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
+#, fuzzy
+msgid "Item"
+msgstr "جدول نهر"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+#, fuzzy
+msgid "Search: "
+msgstr "إبحث"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+#, fuzzy
+msgid "Filter"
+msgstr "الملفّ"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
+#, fuzzy
+msgid "Clear"
+msgstr "السيارة"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8162,10 +8381,4 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
 msgid "Terrace"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:422
-#: ../plugins/terracer/src/terracer/TerracerAction.java:440
-#: ../plugins/terracer/src/terracer/TerracerAction.java:504
-msgid "All"
 msgstr ""
 
@@ -8208,17 +8421,17 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
 msgid "Show Author Panel"
-msgstr ""
+msgstr "أعرض لوحة المؤلف"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98
 msgid "Open User Page"
-msgstr ""
+msgstr "إفتح صفحة المستخدم"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99
 msgid "Open User Page in browser"
-msgstr ""
+msgstr "إفتح صفحة المستخدم في متصفح الإنترنت"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112
 msgid "Select User's Data"
-msgstr ""
+msgstr "إختر معطيات المستخدم/ين"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113
@@ -8238,30 +8451,30 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
 msgid "Join overlapping Areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
 msgid "Joins areas that overlap each other"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
 msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
 msgid "Continue anyway"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:147
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
 msgid "Only up to two areas can be joined at the moment."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
 #, java-format
 msgid "\"{0}\" is not closed and therefore can't be joined."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:169
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
@@ -8271,22 +8484,71 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
 msgid "Please abort if you are not sure"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:186
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187
 msgid "Please select at least one closed way the should be joined."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:194
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
 msgid "No intersections found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
+msgid "Added node on all intersections"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
+msgid "Delete Ways that are not part of an inner multipolygon"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
+#, fuzzy
+msgid "Fix relations"
+msgstr "علاقة واحدة"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
+msgid "Joined self-overlapping area"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
+msgid "Joined overlapping areas"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
 "verify no errors have been introduced."
 msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
+#, fuzzy
+msgid "Fix tag conflicts"
+msgstr "دمج التناقضات."
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
+#, fuzzy
+msgid "Removed Element from Relations"
+msgstr "أمحي من العلاقة"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
+msgid "Join Areas: Remove Short Ways"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
+#, fuzzy
+msgid "Closed Way"
+msgstr "طريق مغلقة الدوران"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
+msgid "Remove tags from inner ways"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
+#, fuzzy
+msgid "Join Areas Function"
+msgstr "تقاطع طرقات سريعة"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9057,9 +9319,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
 msgid "help"
-msgstr ""
+msgstr "مساعدة"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
 msgid "Help / About"
-msgstr ""
+msgstr "المساعدة / حول"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:27
@@ -9252,6 +9514,12 @@
 msgstr ""
 
+#. Plugin Create_grid_of_ways
+#: build/trans_plugins.java:9
+#, fuzzy
+msgid "Create a grid of ways."
+msgstr "أنشئ مساحات"
+
 #. Plugin DirectUpload
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -9260,10 +9528,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid ""
 "The main feature of the plugin is the possibility to delete points of the "
@@ -9273,15 +9541,15 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -9291,10 +9559,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -9302,14 +9570,9 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
 "segments, area surrounded by a (simple) closed way and create measurement "
 "paths (which also can be imported from a gps layer)."
-msgstr ""
-
-#. Plugin navigator
-#: build/trans_plugins.java:27
-msgid "Provides navigation/autorouting functionality"
 msgstr ""
 
@@ -9354,6 +9617,11 @@
 msgstr ""
 
+#. Plugin routing
+#: build/trans_plugins.java:43
+msgid "Provides routing capabilities."
+msgstr ""
+
 #. Plugin slippymap
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9362,10 +9630,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
+#. Plugin tageditor
+#: build/trans_plugins.java:49
+msgid "Provides a dialog for editing tags in a tabular grid."
+msgstr ""
+
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:51
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9375,15 +9648,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:53
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:55
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:57
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9392,5 +9665,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:59
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9399,5 +9672,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:61
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9406,5 +9679,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:63
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10872,5 +11145,5 @@
 #. <condition k="highway" v="construction"/>
 #. color railland
-#. <icon src="transport/railway.png"/>
+#. <icon src="transport/railway_station.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11219,5 +11492,5 @@
 #: build/trans_presets.java:731
 msgid "Motorway Junction"
-msgstr "ملتقى طرقات سريعة"
+msgstr "تقاطع طرقات سريعة"
 
 #. item
@@ -11225,5 +11498,5 @@
 #: build/trans_presets.java:733
 msgid "Edit Motorway Junction"
-msgstr "حرّر ملتقى طرقات سريعة"
+msgstr "حرّر تقاطع طرقات سريعة"
 
 #. item "Waypoints/Motorway Junction" text "Name"
@@ -11378,5 +11651,5 @@
 #: build/trans_presets.java:761
 msgid "Stop"
-msgstr "قفّ"
+msgstr "إشارة وقوف"
 
 #. item
@@ -11687,5 +11960,5 @@
 #: build/trans_presets.java:969
 msgid "Cycle Barrier"
-msgstr ""
+msgstr "حاجز دراجة"
 
 #. item
@@ -11746,10 +12019,10 @@
 #: build/trans_presets.java:1005
 msgid "Border Control"
-msgstr ""
+msgstr "مراقبة الحدود"
 
 #. item
 #: build/trans_presets.java:1006
 msgid "Edit Border Control"
-msgstr ""
+msgstr "حرّر مراقبة الحدود"
 
 #. item "Barriers/Border Control" check "Motorcar"
@@ -11775,5 +12048,5 @@
 #: build/trans_presets.java:1033
 msgid "Spring"
-msgstr ""
+msgstr "نبع"
 
 #. item
@@ -11781,5 +12054,5 @@
 #: build/trans_presets.java:1035
 msgid "Edit Spring"
-msgstr ""
+msgstr "حرّر نبع"
 
 #. item "Water/Spring" text "Name"
@@ -11787,5 +12060,5 @@
 #: build/trans_presets.java:1040
 msgid "Drain"
-msgstr ""
+msgstr "مسرب"
 
 #. item
@@ -11793,10 +12066,10 @@
 #: build/trans_presets.java:1042
 msgid "Edit Drain"
-msgstr ""
+msgstr "حرّر مسرب"
 
 #. item "Water/Drain" combo "Layer"
 #: build/trans_presets.java:1048
 msgid "Stream"
-msgstr ""
+msgstr "جدول نهر"
 
 #. item
@@ -11804,10 +12077,10 @@
 #: build/trans_presets.java:1050
 msgid "Edit Stream"
-msgstr ""
+msgstr "حرّر جدول نهر"
 
 #. item "Water/Stream" combo "Layer"
 #: build/trans_presets.java:1056
 msgid "Canal"
-msgstr ""
+msgstr "قناة"
 
 #. item
@@ -11815,5 +12088,5 @@
 #: build/trans_presets.java:1058
 msgid "Edit Canal"
-msgstr ""
+msgstr "حرّر قناة"
 
 #. item "Water/Canal" combo "Layer"
@@ -12085,10 +12358,10 @@
 #: build/trans_presets.java:1207
 msgid "Marina"
-msgstr ""
+msgstr "مارينا"
 
 #. item
 #: build/trans_presets.java:1208
 msgid "Edit Marina"
-msgstr ""
+msgstr "حرّر مارينا"
 
 #. item "Waterway Point/Marina" text "Name"
@@ -12481,5 +12754,5 @@
 #: build/trans_presets.java:1401
 msgid "Sharing"
-msgstr ""
+msgstr "مشاركة السيارة"
 
 #. item
@@ -12487,5 +12760,5 @@
 #: build/trans_presets.java:1403
 msgid "Edit Car Sharing"
-msgstr ""
+msgstr "حرّر مشاركة السيارة"
 
 #. item
@@ -12548,5 +12821,5 @@
 #: build/trans_presets.java:1463
 msgid "Railway Platform"
-msgstr ""
+msgstr "رصيف محطة القطار"
 
 #. item
@@ -12555,5 +12828,5 @@
 #: build/trans_presets.java:1466
 msgid "Edit Railway Platform"
-msgstr ""
+msgstr "حرّر رصيف محطة القطار"
 
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
@@ -12678,5 +12951,5 @@
 #: build/trans_presets.java:1536 build/trans_surveyor.java:43
 msgid "Hotel"
-msgstr ""
+msgstr "فندق"
 
 #. item
@@ -12685,5 +12958,5 @@
 #: build/trans_presets.java:1539
 msgid "Edit Hotel"
-msgstr "حرّر الفندق"
+msgstr "حرّر فندق"
 
 #. item "Accomodation/Hotel" text "Name"
@@ -12778,5 +13051,5 @@
 #: build/trans_presets.java:1586 build/trans_surveyor.java:47
 msgid "Restaurant"
-msgstr ""
+msgstr "مطعم"
 
 #. item
@@ -12894,5 +13167,5 @@
 #: build/trans_presets.java:1617
 msgid "Bar"
-msgstr ""
+msgstr "حانة"
 
 #. item
@@ -12900,5 +13173,5 @@
 #: build/trans_presets.java:1619
 msgid "Edit Bar"
-msgstr ""
+msgstr "حرّر حانة"
 
 #. item "Food+Drinks/Bar" text "Name"
@@ -14766,10 +15039,10 @@
 #: build/trans_presets.java:2186
 msgid "Works"
-msgstr "الأشغال"
+msgstr "المصانع"
 
 #. item
 #: build/trans_presets.java:2187
 msgid "Edit Works"
-msgstr "حرّر الأشغال"
+msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
@@ -14874,5 +15147,5 @@
 #: build/trans_presets.java:2244
 msgid "Survey Point"
-msgstr "نقطة مراقبة"
+msgstr "نقطة رؤية"
 
 #. item
@@ -14880,5 +15153,5 @@
 #: build/trans_presets.java:2246
 msgid "Edit Survey Point"
-msgstr "حرّر نقطة مراقبة"
+msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
@@ -14984,5 +15257,5 @@
 #: build/trans_presets.java:2289
 msgid "Power Line"
-msgstr "عمود كهرباي"
+msgstr "سلك/خط كهربائي"
 
 #. item
@@ -15207,5 +15480,5 @@
 #: build/trans_presets.java:2374
 msgid "Shops"
-msgstr "دكاكين"
+msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
@@ -15392,5 +15665,5 @@
 #: build/trans_presets.java:2435
 msgid "Computer"
-msgstr ""
+msgstr "حاسوب"
 
 #. item
@@ -15537,5 +15810,5 @@
 #: build/trans_presets.java:2510
 msgid "Outdoor"
-msgstr ""
+msgstr "نشاطات في الخلاء"
 
 #. item
@@ -15543,15 +15816,15 @@
 #: build/trans_presets.java:2512
 msgid "Edit Outdoor Shop"
-msgstr ""
+msgstr "حرّر متجر نشاطات في الخلاء"
 
 #. item "Shops/Outdoor" text "Name"
 #: build/trans_presets.java:2516
 msgid "sports"
-msgstr "مبيع حاجاة للأنشطة رياضية"
+msgstr "مبيع لوازم للأنشطة رياضية"
 
 #. item
 #: build/trans_presets.java:2517
 msgid "Edit Sports Shop"
-msgstr "حرّرمبيع  حاجاة للأنشطة رياضية"
+msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
 #. item "Shops/sports" text "Name"
@@ -15680,5 +15953,5 @@
 #: build/trans_presets.java:2581
 msgid "Point Name"
-msgstr ""
+msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
@@ -15811,5 +16084,5 @@
 #: build/trans_presets.java:2659
 msgid "Locality"
-msgstr "لمحلة"
+msgstr "محلة"
 
 #. item
@@ -15908,5 +16181,5 @@
 #: build/trans_presets.java:2716
 msgid "Edit Civil Boundary"
-msgstr ""
+msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
@@ -17101,5 +17374,5 @@
 #: build/trans_style.java:1091
 msgid "rail"
-msgstr ""
+msgstr "سكة حديد"
 
 #. color rail
@@ -17198,5 +17471,5 @@
 #: build/trans_style.java:678 build/trans_style.java:992
 msgid "viaduct"
-msgstr ""
+msgstr "جسر"
 
 #. color viaduct
@@ -17251,5 +17524,5 @@
 #: build/trans_style.java:835 build/trans_style.java:836
 msgid "riverbank"
-msgstr ""
+msgstr "شاطئ نهر"
 
 #. color water
@@ -17263,5 +17536,5 @@
 #: build/trans_style.java:852
 msgid "stream"
-msgstr ""
+msgstr "جدول نهر"
 
 #. color water
@@ -17275,5 +17548,5 @@
 #: build/trans_style.java:868
 msgid "dock"
-msgstr ""
+msgstr "حوض سفن"
 
 #. color dock
@@ -17301,5 +17574,5 @@
 #: build/trans_style.java:890
 msgid "aqueduct"
-msgstr ""
+msgstr "قنة جر"
 
 #. color aqueduct
@@ -17473,5 +17746,5 @@
 #: build/trans_style.java:1427 build/trans_style.java:1435
 msgid "manmade"
-msgstr ""
+msgstr "من صنع الإنسان"
 
 #. color manmade
@@ -17486,5 +17759,5 @@
 #. <condition k="railway" v="station"/>
 #. color railwaypoint
-#. <icon annotate="true" src="transport/railway.png"/>
+#. <icon annotate="true" src="transport/railway_station.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17501,5 +17774,5 @@
 #. <condition k="railway" v="tram_station"/>
 #. color railwaypoint
-#. <icon annotate="true" src="transport/railway.png"/>
+#. <icon annotate="true" src="transport/railway_station.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17726,5 +17999,5 @@
 #: build/trans_style.java:1204
 msgid "aerialway"
-msgstr ""
+msgstr "خط جوي"
 
 #. color aerialway
@@ -17862,5 +18135,5 @@
 #: build/trans_style.java:1305 build/trans_style.java:1313
 msgid "power"
-msgstr ""
+msgstr "طاقة"
 
 #. color manmade
@@ -17873,5 +18146,5 @@
 #: build/trans_style.java:1354
 msgid "pier"
-msgstr ""
+msgstr "رصيف ميناء"
 
 #. color pier
@@ -17885,5 +18158,5 @@
 #: build/trans_style.java:1362
 msgid "pipeline"
-msgstr ""
+msgstr "خط أنابيب"
 
 #. color manmade
@@ -18018,5 +18291,5 @@
 #: build/trans_style.java:1565
 msgid "leisure"
-msgstr ""
+msgstr "وقت الفراغ"
 
 #. color leisure
@@ -18030,5 +18303,5 @@
 #: build/trans_style.java:1493
 msgid "marina"
-msgstr ""
+msgstr "مارينا"
 
 #. color leisure
@@ -18273,5 +18546,5 @@
 #. <rule>
 #. <condition k="religion" v="bahai"/>
-#. <icon annotate="true" src="religion/church/bahai.png"/>
+#. <icon annotate="true" src="religion/bahai.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18280,5 +18553,5 @@
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
-#. <icon annotate="true" src="religion/church/buddhism.png"/>
+#. <icon annotate="true" src="religion/buddhism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18294,5 +18567,5 @@
 #. <rule>
 #. <condition k="religion" v="hindu"/>
-#. <icon annotate="true" src="religion/church/hinduism.png"/>
+#. <icon annotate="true" src="religion/hinduism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18301,5 +18574,5 @@
 #. <rule>
 #. <condition k="religion" v="jain"/>
-#. <icon annotate="true" src="religion/church/jainism.png"/>
+#. <icon annotate="true" src="religion/jainism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18308,5 +18581,5 @@
 #. <rule>
 #. <condition k="religion" v="jewish"/>
-#. <icon annotate="true" src="religion/church/synagogue.png"/>
+#. <icon annotate="true" src="religion/jewish.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18315,5 +18588,5 @@
 #. <rule>
 #. <condition k="religion" v="muslim"/>
-#. <icon annotate="true" src="religion/church/mosque.png"/>
+#. <icon annotate="true" src="religion/muslim.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18322,5 +18595,5 @@
 #. <rule>
 #. <condition k="religion" v="sikh"/>
-#. <icon annotate="true" src="religion/church/sikhism.png"/>
+#. <icon annotate="true" src="religion/sikhism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18329,5 +18602,5 @@
 #. <rule>
 #. <condition k="religion" v="shinto"/>
-#. <icon annotate="true" src="religion/church/shinto.png"/>
+#. <icon annotate="true" src="religion/shinto.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18336,5 +18609,5 @@
 #. <rule>
 #. <condition k="religion" v="taoist"/>
-#. <icon annotate="true" src="religion/church/taoism.png"/>
+#. <icon annotate="true" src="religion/taoism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18351,5 +18624,5 @@
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
-#. <icon annotate="true" src="religion/cemetery.png"/>
+#. <icon annotate="true" src="rendering/landuse/cemetery.png"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -18664,5 +18937,5 @@
 #: build/trans_style.java:1988 build/trans_style.java:1996
 msgid "health"
-msgstr ""
+msgstr "صحة"
 
 #. color deprecated
@@ -19010,5 +19283,5 @@
 #: build/trans_style.java:2464 build/trans_style.java:2473
 msgid "shop"
-msgstr ""
+msgstr "متجر/دكان"
 
 #. color shop
@@ -19075,5 +19348,5 @@
 #: build/trans_style.java:2531
 msgid "hotel"
-msgstr ""
+msgstr "فندق"
 
 #. color hotel
@@ -19226,5 +19499,5 @@
 #: build/trans_style.java:2674
 msgid "tourism"
-msgstr ""
+msgstr "سياحة"
 
 #. color tourism
@@ -19299,5 +19572,5 @@
 #: build/trans_style.java:2732 build/trans_style.java:2740
 msgid "historic"
-msgstr ""
+msgstr "تاريخي"
 
 #. color historic
@@ -19351,5 +19624,5 @@
 #. <condition k="landuse" v="grass"/>
 #. color cemetery
-#. <icon src="religion/cemetery.png"/>
+#. <icon src="rendering/landuse/cemetery.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19371,8 +19644,8 @@
 #: build/trans_style.java:2927 build/trans_style.java:2935
 msgid "green"
-msgstr ""
+msgstr "خضار"
 
 #. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19383,5 +19656,5 @@
 #: build/trans_style.java:2781
 msgid "quarry"
-msgstr ""
+msgstr "كسارة"
 
 #. color quarry
@@ -19415,5 +19688,5 @@
 #: build/trans_style.java:2797 build/trans_style.java:2805
 msgid "basin"
-msgstr ""
+msgstr "حوض"
 
 #. color basin
@@ -19427,5 +19700,5 @@
 #: build/trans_style.java:2813
 msgid "forest"
-msgstr ""
+msgstr "غابة"
 
 #. color residential
@@ -19439,5 +19712,5 @@
 #: build/trans_style.java:2845
 msgid "farmyard"
-msgstr ""
+msgstr "فناء مزرعة"
 
 #. color farmyard
@@ -19460,5 +19733,5 @@
 #: build/trans_style.java:2854 build/trans_style.java:2862
 msgid "retail"
-msgstr ""
+msgstr "بيع بلمفرق"
 
 #. color retail
@@ -19472,5 +19745,5 @@
 #: build/trans_style.java:2870
 msgid "industrial"
-msgstr ""
+msgstr "صناعي"
 
 #. color industrial
@@ -19496,5 +19769,5 @@
 #: build/trans_style.java:2886
 msgid "greenfield"
-msgstr ""
+msgstr "حقل خضار"
 
 #. color greenfield
@@ -19565,5 +19838,5 @@
 #: build/trans_style.java:2970 build/trans_style.java:2978
 msgid "military"
-msgstr ""
+msgstr "عسكري"
 
 #. color military
@@ -19577,5 +19850,5 @@
 #: build/trans_style.java:2919
 msgid "cemetery"
-msgstr ""
+msgstr "مقبرة/جبانة"
 
 #. color light_water
@@ -19588,5 +19861,5 @@
 #: build/trans_style.java:2995
 msgid "peak"
-msgstr ""
+msgstr "قمّة"
 
 #. color peak
@@ -19601,5 +19874,5 @@
 #: build/trans_style.java:3004
 msgid "glacier"
-msgstr ""
+msgstr "نهر الجليد"
 
 #. color glacier
@@ -19613,5 +19886,5 @@
 #: build/trans_style.java:3012
 msgid "volcano"
-msgstr ""
+msgstr "بركان"
 
 #. color volcano
@@ -19667,5 +19940,5 @@
 #: build/trans_style.java:3116 build/trans_style.java:3124
 msgid "natural"
-msgstr ""
+msgstr "طبيعي"
 
 #. color natural
@@ -19679,5 +19952,5 @@
 #: build/trans_style.java:3036
 msgid "scrub"
-msgstr ""
+msgstr "أشجار منخفضة"
 
 #. color natural
@@ -19691,5 +19964,5 @@
 #: build/trans_style.java:3052
 msgid "heath"
-msgstr ""
+msgstr "أرض بور"
 
 #. color heath
@@ -19703,5 +19976,5 @@
 #: build/trans_style.java:3060
 msgid "wood"
-msgstr ""
+msgstr "غابة/حرش"
 
 #. color water
@@ -19715,5 +19988,5 @@
 #: build/trans_style.java:3092
 msgid "mud"
-msgstr ""
+msgstr "طين"
 
 #. color mud
@@ -19727,5 +20000,5 @@
 #: build/trans_style.java:3100
 msgid "beach"
-msgstr ""
+msgstr "شاطئ"
 
 #. color natural
@@ -19806,5 +20079,5 @@
 #: build/trans_style.java:3188 build/trans_style.java:3196
 msgid "route"
-msgstr ""
+msgstr "طريق"
 
 #. color route
@@ -19854,5 +20127,5 @@
 #: build/trans_style.java:3238
 msgid "boundary"
-msgstr ""
+msgstr "الحدود"
 
 #. color deprecated
@@ -19999,5 +20272,5 @@
 #: build/trans_style.java:3734 build/trans_style.java:3742
 msgid "place"
-msgstr ""
+msgstr "المكان"
 
 #. color area
@@ -20039,5 +20312,5 @@
 #: build/trans_style.java:3867
 msgid "address"
-msgstr ""
+msgstr "العنوان"
 
 #. <?xml version="1.0"?>
@@ -20048,5 +20321,5 @@
 #: build/trans_surveyor.java:6
 msgid "Tunnel Start"
-msgstr ""
+msgstr "بداية الخندق"
 
 #. <button label="Bridge" hotkey="B" type="toggle">
@@ -20056,5 +20329,5 @@
 #: build/trans_surveyor.java:16
 msgid "Village/City"
-msgstr ""
+msgstr "القرية/المدينة"
 
 #. <button label="Parking" hotkey="P" icon="parking">
@@ -20073,5 +20346,5 @@
 #: build/trans_surveyor.java:33
 msgid "Church"
-msgstr ""
+msgstr "كنيسة"
 
 #. <button label="Church" hotkey="C" icon="church">
@@ -20082,5 +20355,5 @@
 #: build/trans_surveyor.java:38
 msgid "Fuel Station"
-msgstr ""
+msgstr "محطة محروقات"
 
 #. <button label="Restaurant" hotkey="R" icon="restaurant">
@@ -20091,5 +20364,5 @@
 #: build/trans_surveyor.java:52
 msgid "Shopping"
-msgstr ""
+msgstr "تسوق"
 
 #. <button label="Shopping" hotkey="S" icon="shopping">
@@ -20099,5 +20372,5 @@
 #: build/trans_surveyor.java:56
 msgid "WC"
-msgstr ""
+msgstr "مراحيض"
 
 #. <button label="WC" hotkey="W" icon="toilet">
@@ -20107,5 +20380,5 @@
 #: build/trans_surveyor.java:60
 msgid "Camping"
-msgstr ""
+msgstr "مخيم"
 
 #. <button label="Residential" hotkey="5">
@@ -20120,5 +20393,5 @@
 #: build/trans_surveyor.java:93 build/trans_surveyor.java:97
 msgid "Test"
-msgstr ""
+msgstr "إختبار"
 
 #. JOSM TagChecker validator file
@@ -20193,5 +20466,5 @@
 #: build/trans_validator.java:49
 msgid "misspelled key name"
-msgstr ""
+msgstr "خطء إملائي في إسم المفتاح"
 
 #. *    : W : / *name */i == * && name != *
@@ -20215,5 +20488,5 @@
 #: build/trans_validator.java:56
 msgid "barrier used on a way"
-msgstr ""
+msgstr "حاجز مستعمل على طريق"
 
 #. way  : W : highway == * && barrier == *
@@ -20222,5 +20495,5 @@
 #: build/trans_validator.java:59 build/trans_validator.java:60
 msgid "maxspeed used for footway"
-msgstr ""
+msgstr "السرعة الأقصى المستعملة لطريق قدم"
 
 #. way  : I : highway == steps && maxspeed == *
@@ -20232,20 +20505,20 @@
 #: build/trans_validator.java:64
 msgid "street name contains ss"
-msgstr ""
+msgstr "إسم شارع يحتوي على ss"
 
 #. *    : I : name == /.*Strasse.*/i
 #: build/trans_validator.java:65
 msgid "abbreviated street name"
-msgstr ""
+msgstr "إسم شارع مختصر"
 
 #. *    : W : name == /.*Str\.?/i
 #: build/trans_validator.java:67
 msgid "relation without type"
-msgstr ""
+msgstr "علاقة بدون نوع"
 
 #. relation : E : type != *
 #: build/trans_validator.java:69
 msgid "restaurant without name"
-msgstr ""
+msgstr "مطعم بدون إسم"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
@@ -20264,5 +20537,5 @@
 #: build/trans_wms.java:5
 msgid "Landsat"
-msgstr ""
+msgstr "Landsat"
 
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg
@@ -20275,5 +20548,5 @@
 #: build/trans_wms.java:8
 msgid "NPE Maps"
-msgstr ""
+msgstr "خرائط NPE"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
@@ -20310,10 +20583,10 @@
 #: build/trans_wms.java:19
 msgid "Oberpfalz Geofabrik.de"
-msgstr ""
+msgstr "Oberpfalz Geofabrik.de"
 
 #. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
-msgstr ""
+msgstr "شوارع  NRW Geofabrik.de"
 
 #~ msgid "News about JOSM"
