Index: applications/editors/josm/i18n/po/ar.po =================================================================== --- applications/editors/josm/i18n/po/ar.po (revision 16009) +++ applications/editors/josm/i18n/po/ar.po (revision 16179) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-19 21:52+0200\n" -"PO-Revision-Date: 2009-06-15 00:01+0000\n" +"POT-Creation-Date: 2009-06-27 14:26+0200\n" +"PO-Revision-Date: 2009-06-19 21:29+0000\n" "Last-Translator: AtomCell \n" "Language-Team: Arabic \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-06-19 19:35+0000\n" +"X-Launchpad-Export-Date: 2009-06-27 12:19+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -28,6 +28,6 @@ #: ../core/src/org/openstreetmap/josm/Main.java:198 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Help" msgstr "المساعدة" @@ -71,8 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:341 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149 @@ -80,6 +79,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570 @@ -99,7 +97,7 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 msgid "Cancel" @@ -204,4 +202,30 @@ msgid "File could not be found." msgstr "لا يمكن العثور عن الملف" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#, java-format +msgid "" +"WARNING: unexpected format of API base URL. Redirection to history page for " +"OSM primitive will probably fail. API base URL is: ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#, fuzzy +msgid "Please select at least one already uploaded node, way, or relation." +msgstr "الرجاء إختيار على الأقل عقدتين للدمج." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 +msgid "Warning" +msgstr "التحذير" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#, java-format +msgid "" +"WARNING: launching browser windows for the first {0} of {1} selected " +"primitives only" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 @@ -247,5 +271,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "خط العرض" @@ -254,5 +278,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "خط الطول" @@ -289,7 +313,7 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 -#: ../plugins/terracer/src/terracer/TerracerAction.java:82 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 +#: ../plugins/terracer/src/terracer/TerracerAction.java:72 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40 @@ -322,4 +346,48 @@ msgstr "الرجاء إختيار على الأقل ثلاثة عقد." +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#, java-format +msgid "" +"Current number of changes exceeds the max. number of changes, current is " +"{0}, max is {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +msgid "API Capabilities Violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 +msgid "Failed to initialize API. Please try again later." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 +msgid "API initialization failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#, java-format +msgid "" +"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +"length {2}. Values length is {3}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#, fuzzy +msgid "Precondition Violation" +msgstr "علاقة متناقضة" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#, java-format +msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 msgid "data" @@ -335,5 +403,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 msgid "conflict" msgstr "التناقض" @@ -413,6 +481,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:109 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:301 msgid "Enter values for all conflicts." msgstr "ادخل القيم لكل التناقضات." @@ -420,5 +488,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303 msgid "Solve Conflicts" msgstr "حلل التناقضات" @@ -637,11 +705,11 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:556 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:559 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:563 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -671,5 +739,5 @@ #: ../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:149 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 @@ -712,17 +780,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18 msgid "History of Element" msgstr "الخط الزمني للعنصر" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:27 -msgid "Display history information about OSM ways or nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:77 -msgid "" -"Please select at least one node, way or relation. Only already uploaded " -"elements have a history." +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 +msgid "Display history information about OSM ways, nodes, or relations." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 +#, fuzzy +msgid "Info about Element" +msgstr "الخط الزمني للعنصر" + +#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 +msgid "Display object information about OSM nodes, ways, or relations." msgstr "" @@ -859,10 +931,7 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54 #: ../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:37 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 #, java-format @@ -1045,5 +1114,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136 msgid "Conflicts" msgstr "التناقضات" @@ -1192,5 +1261,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:305 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 msgid "" "A role based relation membership was copied to all new ways.\n" @@ -1198,5 +1267,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +msgid "" +"A relation membership was copied to all new ways.\n" +"You should verify this and correct it when necessary." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 #, java-format msgid "Split way {0} into {1} parts" @@ -1333,128 +1408,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70 -msgid "Undeleting Way..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:138 -#, java-format -msgid "" -"There are {0} additional nodes used by way {1}
which are deleted on " -"the server.

Do you want to undelete these nodes too?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170 -#, java-format -msgid "Checking whether node {0} is gone ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 -msgid "Undeleting relation..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:252 -#, java-format -msgid "" -"There are {0} additional primitives referred to by relation {1}" -"
which are deleted on the server.

Do you want to undelete them too?" -"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284 -#, java-format -msgid "Checking whether primitive {0} is gone ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339 -msgid "Keep mine" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340 -msgid "Delete mine" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:344 -#, java-format -msgid "" -"The OSM primitive with id {0} has been deleted
on " -"the server by another mapper.

Click {1} to keep your " -"primitive and ignore the deleted state.
Your primitive will be assigend a " -"new id.
Click {2} to accept the state on the server and " -"to delete your primitive.
Click {3} to cancel.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356 -msgid "Primitive deleted on the server" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:370 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:344 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:383 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58 msgid "Failed to update the selected primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59 msgid "Update failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71 #, java-format msgid "Could not find primitive with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72 msgid "Missing primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457 +#: ../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:458 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:471 -#, java-format -msgid "" -"There are {0} primitives
selected for individual " -"update. Please reduce the selection
to max. {1} primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476 -msgid "Selection too big" msgstr "" @@ -1468,59 +1451,59 @@ msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99 msgid "Objects to add:" msgstr "الأغراض اللتي يجب إضافتها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107 msgid "Objects to modify:" msgstr "الأغراض اللتي يجب تغييرها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115 msgid "Objects to delete:" msgstr "الأغراض اللتي يجب حذفها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122 msgid "Provide a brief comment for the changes you are uploading:" msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131 msgid "Upload these changes?" msgstr "حمّل هذه التغييرات :" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 msgid "Upload Changes" msgstr "حمّل التغييرات" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:152 +#: ../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:157 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "يوجد تناقضات غير محلولة. يجب عليك حلّ هذه التناقضات أولاً." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "No changes to upload." msgstr "لا يوجد تغييرات للتحميل." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208 msgid "Uploading" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320 #, java-format msgid "" @@ -1534,10 +1517,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 msgid "Conflict detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359 +#. should not happen +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1548,10 +1538,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:399 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417 #, java-format msgid "" @@ -1561,9 +1551,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424 msgid "Precondition violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:452 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 #, java-format msgid "" @@ -1573,18 +1563,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:463 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468 msgid "Primitive already deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:484 -#, java-format -msgid "Error header \"{0}\" doesn't match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:539 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544 msgid "Upload to OSM API failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557 #, java-format msgid "" @@ -1706,29 +1696,29 @@ msgstr "معطيات OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44 msgid "Data Layer" msgstr "طبقة المعطيات" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:55 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "نزل {0} من {1} (باقية {2} )" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +msgid "The following errors occurred during mass download:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96 msgid "Errors during Download" msgstr "أخطاء عند التنزيل" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:135 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134 #, java-format msgid "" "There are {0} primitives in your local dataset which
might be " -"deleted on the server. If you later try to delete or
update them on the " -"server the server is likely to report a
conflict.

Click {1}" -" to check these primitives individually.
Click {2} to ignore.
" +"deleted on the server. If you later try to delete or
update them the " +"server is likely to report a
conflict.

Click {1} " +"to check the state of these primitives
on the server.
Click {2}" +" to ignore.
" msgstr "" @@ -1872,5 +1862,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 @@ -2218,9 +2208,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78 -#, java-format -msgid "Resolve {0} conflicts in {1} objects" -msgstr "حلّ {0} التناقضات في {1} أغراض" - #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54 #, java-format @@ -2230,5 +2215,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83 msgid "cannot resolve undecided conflict" msgstr "" @@ -2294,5 +2279,5 @@ #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 @@ -2309,9 +2294,14 @@ msgstr[5] "عقد" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:157 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 msgid "Purging 1 primitive" msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 #, java-format msgid "" @@ -2320,4 +2310,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 +#, fuzzy, java-format +msgid "removing reference from relation {0}" +msgstr "أحذف من الخيار" + #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52 #, java-format @@ -2342,10 +2337,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69 #, java-format msgid "Undelete {0} primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44 +#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41 #, java-format msgid "Resolve version conflicts for {0} {1}" @@ -2361,5 +2356,5 @@ msgstr "طبّق ؟" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -2448,25 +2443,4 @@ msgstr "لم أتمكن من تحميل التفضيلات من الخادم." -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34 -msgid "different" -msgstr "مختلف" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262 -msgid "deleted" -msgstr "تم حذفه" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "true" -msgstr "حقيقي" - -#: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19 -msgid "false" -msgstr "خاطئ" - -#: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20 -msgid "position" -msgstr "المكان" - #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30 msgid "Decimal Degrees" @@ -2493,21 +2467,21 @@ msgstr "ش." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:287 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 #, java-format msgid "parameter {0} > 0 required. Got {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:84 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128 msgid "incomplete" msgstr "غير كامل" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 #, java-format msgid "Error: {0}" msgstr "خطأ : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 #, java-format msgid "Warning: {0}" @@ -2537,5 +2511,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:88 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 @@ -2572,5 +2546,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:107 +#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118 #, java-format msgid "{0} member" @@ -2579,22 +2553,22 @@ msgstr[1] "{0} أعضاء" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136 msgid "highway" msgstr "من النوع طريق" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137 #: build/trans_presets.java:2994 msgid "railway" msgstr "خط سكة حديد" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 msgid "waterway" msgstr "مجرى مياه" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:124 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:139 msgid "landuse" msgstr "إستعمال الأرض" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:143 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 #, java-format @@ -2651,4 +2625,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 #, java-format @@ -2792,4 +2769,14 @@ msgstr "النص" +#. should not happen +#. +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225 +#, java-format +msgid "" +"My primitive with id {0} and version {1} is visible although their primitive " +"with lower version {2} is not visible. Can't deal with this inconsistency. " +"Keeping my primitive. " +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 #, java-format @@ -2810,5 +2797,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144 msgid "background" @@ -2877,50 +2864,4 @@ msgstr "لم أتمكن من كتابة العلامة المرجعية." -#. setting up the properties table -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218 -#: ../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 "المفتاح" - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 -#: ../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 "القيمة" - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224 -#, java-format -msgid "{0} object has conflicts:" -msgid_plural "{0} objects have conflicts:" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227 -msgid "my version:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233 -msgid "their version:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239 -msgid "resolved version:" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76 msgid "Message of the day not available" @@ -3093,22 +3034,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 msgid "File" msgstr "الملفّ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 msgid "View" msgstr "العرض" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 msgid "Tools" msgstr "العدة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "التعيينات المسبقة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 @@ -3121,21 +3062,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:219 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 msgid "Wireframe View" msgstr "أعرض الأسلاك" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 msgid "Toggle Wireframe view" msgstr "أقلب عرض الأسلاك" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 msgid "Full Screen" msgstr "ملء الشاشة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 msgid "Toggle Full Screen view" msgstr "أقلب عرض ملء الشاشة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 msgid "Audio" msgstr "سمعيّ" @@ -3271,11 +3212,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 @@ -3283,51 +3224,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 msgid "Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203 msgid "Members" msgstr "الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3335,25 +3276,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 msgid "Conflict Resolution" msgstr "" @@ -3390,5 +3331,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 msgid "My version" msgstr "" @@ -3399,5 +3340,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3411,5 +3352,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "" @@ -3594,9 +3535,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#, java-format +msgid "" +"An error occurred while communicating with the server
Details: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +msgid "Communication with server failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +msgid "Yes, undelete them too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +msgid "No, cancel operation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#, java-format +msgid "" +"There are {0} additional nodes used by way {1}
which are deleted on " +"the server.

Do you want to undelete these nodes too?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +msgid "Undelete additional nodes?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#, java-format +msgid "" +"There are {0} additional primitives referred to by relation {1}" +"
which are deleted on the server.

Do you want to undelete them too?" +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +msgid "Undelete dependent primitives?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3604,48 +3589,125 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgid "Visible State:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +msgid "deleted" +msgstr "تم حذفه" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +msgid "visible (on the server)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +msgid "not visible (on the server)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#, fuzzy +msgid "Keep a clone of the local version" +msgstr "الرجاء إدخال إسم للموقع." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +msgid "Physically delete from local dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 msgid "Undecide conflict between deleted state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +msgid "Keep my visible state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +msgid "Yes, reset the id" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 +#, fuzzy +msgid "No, abort" +msgstr "لا إختصار" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#, java-format +msgid "" +"To keep your local version, JOSM
has to reset the id of {0} {1} to " +"0.
On the next upload the server will assign
it a new id.
Do yo " +"agree?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +msgid "Reset id to 0" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608 +msgid "Keep their visible state" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623 +msgid "Yes, purge it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628 +#, java-format +msgid "" +"JOSM will have to remove your local primitive with id {0}
from the " +"dataset.
Do you agree?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633 +#, fuzzy +msgid "Remove from dataset" +msgstr "أحذف من الخيار" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +msgid "Undecide conflict between visible state" msgstr "" @@ -3690,4 +3752,29 @@ msgstr "" +#. setting up the properties table +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218 +#: ../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 "المفتاح" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../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 "القيمة" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 msgid "cannot apply undecided tag merge item" @@ -3746,5 +3833,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 @@ -3768,5 +3855,5 @@ msgstr "تكدس الأوامر: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 @@ -3775,63 +3862,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "Resolve" msgstr "حلّ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70 msgid "Conflict" msgstr "التناقض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69 msgid "Merging conflicts." msgstr "دمج التناقضات." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118 -msgid "WARNING: unexpected value for preference conflict.resolution, got " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159 -msgid "Resolve Conflicts" -msgstr "حلّ التناقضات" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161 -msgid "Solve Conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134 #, java-format msgid "Conflicts: {0}" msgstr "التناقضات: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 msgid "Apply Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 msgid "Apply partial resolutions" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 #, java-format msgid "" @@ -3841,11 +3916,4 @@ "resolving conflicts." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124 -msgid "Warning" -msgstr "التحذير" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88 @@ -4273,5 +4341,5 @@ #. item "Amenities/Toilets" combo "Fee" #. item "Health/Pharmacy" combo "Dispensing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -4296,5 +4364,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419 #: build/trans_presets.java:312 build/trans_presets.java:313 #: build/trans_presets.java:314 build/trans_presets.java:315 @@ -4321,27 +4389,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:423 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424 #, java-format msgid "Members: {0}" msgstr "الأعضاء: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432 #, java-format msgid "Relation Editor: {0}" msgstr "محرّر العلاقات: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:545 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543 msgid "There were conflicts during import." msgstr "حصل تعارض حين الإستيراد." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:555 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553 msgid "Error parsing server response." msgstr "خطأ عند التحليل النحوي لردّ المخدم." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556 msgid "Cannot connect to server." msgstr "غير قادر على الإتصال بلمخدم." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560 msgid "Error when communicating with server." msgstr "" @@ -4520,5 +4588,5 @@ msgstr "تكبير/تصغير" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 msgid "Slippy map" msgstr "خريطة زالقة" @@ -4545,28 +4613,28 @@ msgstr "أرقام البلاطة" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279 #, java-format msgid "Images for {0}" msgstr "الصول لِــ {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:103 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284 msgid "Read GPX..." msgstr "إقرءGPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:112 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293 #, java-format msgid "No time for point {0} x {1}" msgstr "لا توقيت للنقطة {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:117 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136 #, java-format @@ -4574,34 +4642,29 @@ msgstr "جاري قراءة {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:203 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:255 -#, java-format -msgid "Image with path {0} does not exist or is not readable." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 #, java-format msgid "GPS start: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:364 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 #, java-format msgid "GPS end: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:366 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 #, java-format msgid "current delta: {0}s" msgstr "الإنحراف الحالي: {0}ث" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 msgid "timezone difference: " msgstr "إختلاف في التوقيت الجغرافي: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278 msgid "image" @@ -4614,14 +4677,14 @@ msgstr[5] "صور" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 #, java-format msgid "{0} within the track." msgstr "{0} من ضمن المسلك." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 msgid "Sync clock" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 @@ -4629,32 +4692,32 @@ msgstr "صور (*.jpg)JPEG" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:489 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:497 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715 msgid "Image" msgstr "الصورة" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:499 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:510 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:526 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:528 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 msgid "Time entered could not be parsed." msgstr "" @@ -4806,5 +4869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -4870,33 +4933,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 #, java-format msgid "There were {0} conflicts during import." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385 #, java-format msgid "{0} consists of:" msgstr "{0} يتألف من:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:392 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 #, java-format msgid " ({0} deleted.)" msgstr " ({0} ممحي.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" @@ -6113,7 +6176,7 @@ #: ../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 +#: ../plugins/terracer/src/terracer/TerracerAction.java:412 +#: ../plugins/terracer/src/terracer/TerracerAction.java:430 +#: ../plugins/terracer/src/terracer/TerracerAction.java:494 msgid "All" msgstr "" @@ -6822,5 +6885,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609 -#: ../plugins/terracer/src/terracer/TerracerAction.java:108 +#: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format msgid "Change {0} object" @@ -6834,5 +6897,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 -#: ../plugins/terracer/src/terracer/TerracerAction.java:110 +#: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "الخيار فارغ !" @@ -6868,4 +6931,6 @@ #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 @@ -6883,10 +6948,11 @@ msgstr "جاري تحضير المعطيات..." -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 msgid "GPX Files" msgstr "ملفات GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86 @@ -6895,6 +6961,34 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#, java-format +msgid "File \"{0}\" does not exist" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#, java-format +msgid "Parsing file \"{0}\" failed" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 msgid "Parse error: invalid document structure for gpx document" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#, java-format +msgid "no primitive with id {0} in local dataset. Can't infer primitive type" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#, java-format +msgid "Server replied with response code 404 for id {0}. Skipping." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +msgid "" +"Server replied with response code 404, retrying with an individual request " +"for each primitive" msgstr "" @@ -6904,4 +6998,5 @@ #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "الإحداثيات المستوردة: " @@ -6972,13 +7067,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 msgid "Preparing..." msgstr "اعداد..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 msgid "Uploading..." msgstr "جاري الإرسال..." @@ -7073,58 +7168,58 @@ msgstr "ملفات الخادم أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166 msgid "Unknown version" msgstr "نسخة مجهولة" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 msgid " has zero ref" msgstr "لا يوجد لــ أي مرجع" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:214 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:222 msgid "Found element in non-relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:219 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 msgid "Illegal object with id=0" msgstr "غرض غير مسموح به معروف بــ id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315 #, java-format msgid "" @@ -7132,24 +7227,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 #, java-format msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:485 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495 msgid "Prepare OSM data..." msgstr "حضّر المعطيات أو.أس.أم ..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 msgid "Ill-formed node id" msgstr "ضذوذ تكوين معرف العقدة" @@ -7178,5 +7273,5 @@ msgstr "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 #, java-format msgid "" @@ -7185,5 +7280,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" @@ -7414,9 +7509,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:300 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 msgid "This is after the end of the recording" msgstr "يتم ذلك بعد الإنتهاء من التسجيل" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 msgid "Error playing sound" msgstr "خطأ تشغيل صوت" @@ -8365,4 +8460,23 @@ msgstr "" +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33 +msgid "TangoGPS Files (*.log)" +msgstr "" + +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 +#, fuzzy +msgid "Format errors: " +msgstr "خطء في صيغة المعطيات" + +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112 +#, fuzzy +msgid "TangoGPS import success" +msgstr "نجاح إسيراد NMEA" + +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 +#, fuzzy +msgid "TangoGPS import faliure!" +msgstr "فشل إستيراد NMEA !" + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21 @@ -9082,4 +9196,15 @@ msgstr "" +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97 +msgid "" +"The openstreetbus plugin is using the old server at appspot.com.
A " +"new server is available at schokokeks.org.
Do you want to switch to the " +"new server? (Strongly recommended)" +msgstr "" + +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100 +msgid "Switch to new openstreetbugs server?" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51 msgid "" @@ -9179,9 +9304,9 @@ msgstr "إمتداد الملف غير معروف: {0}" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:41 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:39 msgid "Osmarender" msgstr "" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:96 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:94 msgid "" "Firefox not found. Please set firefox executable in the Map Settings page of " @@ -9189,9 +9314,9 @@ msgstr "" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:127 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:125 msgid "osmarender options" msgstr "" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:128 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 msgid "Firefox executable" msgstr "" @@ -9335,35 +9460,44 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 msgid "Show Tile Status" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 msgid "Request Update" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +msgid "Flush Tile Cache" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 msgid "image not loaded" msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 +#, fuzzy +msgid "image loading..." +msgstr "جاري الإرسال..." #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9404,14 +9538,14 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 #, java-format msgid "requested: {0}" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 msgid "error requesting update" msgstr "" @@ -9578,49 +9712,49 @@ msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:78 -#: ../plugins/terracer/src/terracer/TerracerAction.java:82 +#: ../plugins/terracer/src/terracer/TerracerAction.java:68 +#: ../plugins/terracer/src/terracer/TerracerAction.java:72 msgid "Terrace a building" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:80 +#: ../plugins/terracer/src/terracer/TerracerAction.java:70 msgid "Creates individual buildings from a long building." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:140 +#: ../plugins/terracer/src/terracer/TerracerAction.java:130 msgid "Select a single, closed way of at least four nodes." msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:209 +#: ../plugins/terracer/src/terracer/TerracerAction.java:199 msgid "Terrace" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:423 -#: ../plugins/terracer/src/terracer/TerracerAction.java:447 +#: ../plugins/terracer/src/terracer/TerracerAction.java:413 +#: ../plugins/terracer/src/terracer/TerracerAction.java:437 msgid "Even" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:424 +#: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:482 +#: ../plugins/terracer/src/terracer/TerracerAction.java:472 msgid "Highest number" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:483 +#: ../plugins/terracer/src/terracer/TerracerAction.java:473 msgid "Lowest number" msgstr "" -#: ../plugins/terracer/src/terracer/TerracerAction.java:484 +#: ../plugins/terracer/src/terracer/TerracerAction.java:474 msgid "Interpolation" msgstr "" #. item "Buildings/Addresses" text "House name" -#: ../plugins/terracer/src/terracer/TerracerAction.java:485 +#: ../plugins/terracer/src/terracer/TerracerAction.java:475 #: build/trans_presets.java:2173 msgid "Street name" msgstr "إسم الشارع" -#: ../plugins/terracer/src/terracer/TerracerAction.java:485 +#: ../plugins/terracer/src/terracer/TerracerAction.java:475 msgid "Optional" msgstr "" @@ -9663,30 +9797,30 @@ msgstr "عفواً، لا يعمل للمستخدمين مجهولي الهوية" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99 msgid "Join overlapping Areas" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99 msgid "Joins areas that overlap each other" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111 msgid "Continue anyway" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133 msgid "Only up to two areas can be joined at the moment." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:138 #, java-format msgid "\"{0}\" is not closed and therefore can't be joined." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64 msgid "" @@ -9696,38 +9830,38 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67 msgid "Please abort if you are not sure" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172 msgid "Please select at least one closed way the should be joined." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180 msgid "No intersection found. Nothing was changed." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202 msgid "Added node on all intersections" msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 +msgid "Fix relations" +msgstr "" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236 +msgid "Joined self-overlapping area" +msgstr "" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 +msgid "Joined overlapping areas" +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 -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 " @@ -9735,65 +9869,65 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316 msgid "Fix tag conflicts" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464 msgid "Removed Element from Relations" msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573 +msgid "Join Areas: Remove Short Ways" +msgstr "" + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589 -msgid "Join Areas: Remove Short Ways" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605 msgid "Closed Way" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856 msgid "Remove tags from inner ways" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885 msgid "Join Areas Function" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Jump To Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 msgid "Opens a dialog that allows to jump to a specific location" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 +msgid "URL" +msgstr "" + +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +msgid "Jump there" +msgstr "" + #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 -msgid "URL" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105 -msgid "Jump there" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10832,6 +10966,11 @@ msgstr "" +#. Plugin dataimport +#: build/trans_plugins.java:13 +msgid "Allows to import various file formats into JOSM directly." +msgstr "" + #. Plugin DirectUpload -#: build/trans_plugins.java:13 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -10840,10 +10979,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:15 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -10852,15 +10991,15 @@ #. Plugin globalsat -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:21 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin grid -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:23 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -10870,10 +11009,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -10881,5 +11020,5 @@ #. Plugin measurement -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -10889,5 +11028,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -10897,15 +11036,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -10913,5 +11052,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -10919,5 +11058,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -10926,20 +11065,20 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "Let other applications send commands to JOSM." msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم." #. Plugin routing -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -10948,15 +11087,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -10966,15 +11105,15 @@ #. Plugin tcx-support -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Directly load TCX files from JOSM." msgstr "حمّل ملفات TCX مباشرتاً من ج.أو.أس.أم." #. Plugin terracer -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -10983,5 +11122,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -10990,5 +11129,5 @@ #. Plugin validator -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -10997,10 +11136,10 @@ #. Plugin waydownloader -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:71 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -22161,21 +22300,39 @@ msgstr "" +#~ msgid "Uploading data" +#~ msgstr "جاري تحميل التغييرات" + +#~ msgid "Email" +#~ msgstr "البريد الإلكتروني" + +#~ msgid "Resolve Conflicts" +#~ msgstr "حلّ التناقضات" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم." + +#~ msgid "OSM username (email)" +#~ msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)" + +#~ msgid "Unknown host" +#~ msgstr "مضيف غير معروف" + +#~ msgid "position" +#~ msgstr "المكان" + +#~ msgid "different" +#~ msgstr "مختلف" + +#~ msgid "true" +#~ msgstr "حقيقي" + +#~ msgid "false" +#~ msgstr "خاطئ" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "حلّ {0} التناقضات في {1} أغراض" + #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة" - -#~ msgid "Uploading data" -#~ msgstr "جاري تحميل التغييرات" - -#~ msgid "Email" -#~ msgstr "البريد الإلكتروني" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم." - -#~ msgid "OSM username (email)" -#~ msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)" - -#~ msgid "Unknown host" -#~ msgstr "مضيف غير معروف" #~ msgid ""