Index: applications/editors/josm/i18n/po/ar.po =================================================================== --- applications/editors/josm/i18n/po/ar.po (revision 18191) +++ applications/editors/josm/i18n/po/ar.po (revision 18273) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 15:06+0200\n" -"PO-Revision-Date: 2009-10-07 17:10+0000\n" +"POT-Creation-Date: 2009-10-25 13:10+0100\n" +"PO-Revision-Date: 2009-10-17 15:05+0000\n" "Last-Translator: Dirk Stöcker \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-10-17 12:23+0000\n" +"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,11 +27,11 @@ #. FIXME why is help not a JosmAction? #: ../core/src/org/openstreetmap/josm/Main.java:202 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:99 +#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:23 +#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351 msgid "Help" @@ -50,5 +50,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 @@ -73,9 +73,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:262 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 @@ -94,8 +95,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:78 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:128 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -124,5 +124,4 @@ #: ../core/src/org/openstreetmap/josm/Main.java:489 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 @@ -159,6 +158,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:650 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:658 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -166,7 +165,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:162 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404 @@ -181,7 +180,8 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:39 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -280,5 +280,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247 msgid "Plugins" msgstr "إضافات" @@ -330,25 +330,27 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 @@ -407,11 +409,11 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 @@ -503,6 +505,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 @@ -517,6 +519,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104 @@ -602,5 +604,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 @@ -657,23 +659,23 @@ msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162 #, java-format msgid "Combine {0} ways" msgstr "ادمج {0} طرقات" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187 msgid "Please select at least two ways to combine." msgstr "الرجاء إختر على الأقل طريقتين للدمج." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25 msgid "Copy" msgstr "نسخ" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24 msgid "Copy selected objects to paste buffer." msgstr "نسخ الكائنات المختارة الى وسيط الصق" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64 msgid "Please select something to copy." msgstr "الرجاء إختيار شيء للنسخ." @@ -702,9 +704,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 @@ -764,6 +766,7 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88 -#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -782,17 +785,39 @@ msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 msgid "Download parent ways/relations..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39 msgid "Download primitives referring to one of the selected primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181 +#, java-format +msgid "Id > 0 required, got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217 +#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 #, java-format @@ -800,20 +825,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 msgid "Conflicts during download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:147 -#, java-format -msgid "({0}/{1}) Loading parents of primitive {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253 +#, java-format +msgid "({0}/{1}) Loading parents of node {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254 +#, java-format +msgid "({0}/{1}) Loading parents of way {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255 +#, java-format +msgid "({0}/{1}) Loading parents of relation {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 msgid "Duplicate" msgstr "نسخة مطابقة" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 msgid "Duplicate selection by copy and immediate paste." msgstr "" @@ -861,5 +896,4 @@ #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:456 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 @@ -928,6 +962,6 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 @@ -949,7 +983,6 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18 -#, fuzzy msgid "Object history" -msgstr "التاريخ" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 @@ -979,5 +1012,5 @@ msgstr "ضمّ العقدة و الخط" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46 msgid "No Shortcut" msgstr "لا إختصار" @@ -1071,5 +1104,5 @@ msgstr "حرّك الأغراض {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 msgid "Cannot move objects outside of the world." @@ -1137,7 +1170,6 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90 -#, fuzzy msgid "Start downloading data" -msgstr "جاري تحميل المعطيات" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91 @@ -1157,7 +1189,6 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 -#, fuzzy msgid "Orthogonalize Shape / Undo" -msgstr "إسقاط عمودي" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 @@ -1166,7 +1197,6 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97 -#, fuzzy msgid "Orthogonalize / Undo" -msgstr "إسقاط عمودي" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104 @@ -1178,7 +1208,6 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 -#, fuzzy msgid "Undo Orthogonalize Shape" -msgstr "إسقاط عمودي" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116 @@ -1191,7 +1220,6 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173 -#, fuzzy msgid "Usage" -msgstr "الإستعمال" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 @@ -1203,24 +1231,23 @@ msgstr "إسقاط عمودي" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 msgid "Paste" msgstr "ألصِق" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30 msgid "Paste contents of paste buffer." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "Pasting {0} tag" @@ -1229,5 +1256,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108 #, java-format msgid "to {0} primitive" @@ -1394,5 +1421,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1660,17 +1687,17 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 -#, fuzzy, java-format +#, java-format msgid "Synchronize node {0} only" -msgstr "مزامنة الصوت" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 -#, fuzzy, java-format +#, java-format msgid "Synchronize way {0} only" -msgstr "مزامنة الصوت" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, fuzzy, java-format +#, java-format msgid "Synchronize relation {0} only" -msgstr "تمّت مزامنة الصوت على النقطة {0}." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 @@ -1718,23 +1745,51 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 +#, fuzzy +msgid "Prepare conflict resolution" +msgstr "علاقة متناقضة" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353 +#, java-format +msgid "Click to download all parent ways for node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359 +msgid "Click to cancel and to resume editing the map" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 #, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +msgid "" +"Uploading failed because you tried to delete node {0} " +"which is still in use in way {1}.

Click {2} to " +"download all parent ways of node {0}.
If necessary JOSM will create " +"conflicts which you can resolve in the Conflict Resolution Dialog." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374 +msgid "Node still in use" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429 +#, java-format +msgid "Warning: error header \"{0}\" did not match with an expected pattern" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:458 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524 msgid "Upload to OSM API failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:481 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:538 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1743,5 +1798,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:569 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 #, java-format @@ -1756,13 +1811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48 -#, fuzzy msgid "Upload all changes in the current selection to the OSM server." -msgstr "حمّل التفضيلات الحالية إلى الخادم" - -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, java-format -msgid "Parameter ''{0}'' must not be null" msgstr "" @@ -2033,5 +2080,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -2042,5 +2089,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "" @@ -2100,10 +2147,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2477,4 +2524,9 @@ msgid "Add relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50 +#, fuzzy, java-format +msgid "Added {0} objects" +msgstr "غيّر غرض {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 @@ -2556,5 +2608,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 msgid "Double conflict" msgstr "" @@ -2590,5 +2642,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 #, java-format msgid "Delete {0} object" @@ -2597,5 +2649,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} node" @@ -2604,5 +2656,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} way" @@ -2611,5 +2663,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 #, java-format msgid "Delete {0} relation" @@ -2618,14 +2670,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251 msgid "Conflicting relation" msgstr "علاقة متناقضة" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "أمحي من العلاقة" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258 #, java-format msgid "" @@ -2634,5 +2686,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269 #, java-format msgid "" @@ -2641,5 +2693,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456 +#. FIXME: relation memberships are not handled +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475 msgid "Split way segment" msgstr "" @@ -2647,5 +2700,5 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139 msgid "" @@ -2655,5 +2708,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507 msgid "Delete confirmation" msgstr "" @@ -2974,14 +3027,4 @@ #, java-format msgid "Changeset {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:454 -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34 -#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 -#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 -#, java-format -msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." msgstr "" @@ -3039,24 +3082,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108 #, java-format msgid "Error: {0}" msgstr "خطأ : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108 #, java-format msgid "Warning: {0}" msgstr "تحذير: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:319 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:375 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64 #, java-format @@ -3064,15 +3107,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:377 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37 #, java-format msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:55 #, java-format msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''." @@ -3128,4 +3172,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34 +#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73 +#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80 +#, java-format +msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:105 msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''." @@ -3138,128 +3191,133 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:487 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "أمحي العضو ''{0}'' في العلاقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:866 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "للطريق ''{0}'' أقل من نقطتين." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 msgid "More than one \"to\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 -msgid "More than one \"via\" found." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637 +msgid "More than one \"via\" found." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642 #, java-format msgid "Unknown role ''{0}''." msgstr "دور غير معروف ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 #, java-format msgid "Unknown member type for ''{0}''." msgstr "نوع عضو غير معروف لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:646 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651 msgid "No \"from\" way found." msgstr "لم أجد طريق \"من\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:650 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655 msgid "No \"to\" way found." msgstr "لم أجد طريق \"إلى\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:654 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:663 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:667 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:694 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:821 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:875 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:887 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:945 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1034 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "الطريق الداخلية ''{0}''موجودة في الخارج." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1099 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1125 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1329 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1421 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1330 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1422 msgid "text" msgstr "النص" +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423 +#, fuzzy +msgid "areatext" +msgstr "النص" + #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245 #, java-format msgid "" @@ -3276,5 +3334,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3289,5 +3347,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3302,5 +3360,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3340,4 +3398,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3349,5 +3408,11 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 -msgid "Lambert Zone (France)" +#, fuzzy +msgid "Lambert 4 Zones (France)" +msgstr "حزام لامبيرت (فرنسا)" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#, fuzzy +msgid "Lambert CC9 Zone (France)" msgstr "حزام لامبيرت (فرنسا)" @@ -3491,10 +3556,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:101 +#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 -#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:22 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26 msgid "Show help information" -msgstr "أضف معلومات عن المؤلف" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 @@ -3856,4 +3920,73 @@ msgstr "جاري التهيئة" +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125 +msgid "" +"Please confirm to remove 1 object from 1 " +"relation." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129 +#, java-format +msgid "" +"Please confirm to remove 1 object from {0} " +"relations." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 +#, java-format +msgid "" +"Please confirm to remove {0} objects from {1} " +"relations." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 +#, fuzzy, java-format +msgid "Deleting {0} object" +msgid_plural "Deleting {0} objects" +msgstr[0] "غيّر غرض {0}" +msgstr[1] "غيّر {0} غرضين" +msgstr[2] "غيّر {0} أغراض" +msgstr[3] "غيّر {0} غرض" +msgstr[4] "غيّر {0} أغراض" +msgstr[5] "غيّر {0} غرض" + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 +#, fuzzy +msgid "Delete objects" +msgstr "امحي الأغراض المختارة." + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 +#, fuzzy +msgid "To delete" +msgstr "تم حذفه" + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 +#, fuzzy +msgid "From Relation" +msgstr "العلاقة" + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 +msgid "Pos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 +msgid "Role" +msgstr "الدّور" + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 +msgid "Click to close the dialog and remove the object from the relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 +msgid "Click to close the dialog and to abort deleting the objects" +msgstr "" + #. * #. * compare my version of an {@see OsmPrimitive} with their version @@ -3889,5 +4022,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 @@ -3904,5 +4037,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141 msgid "Members" @@ -4370,12 +4503,4 @@ msgid "Undecide conflict between visible state" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 -msgid "Role" -msgstr "الدّور" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -4519,5 +4644,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 msgid "Apply" msgstr "" @@ -4667,5 +4792,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511 msgid "Role:" msgstr "" @@ -4686,8 +4811,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87 msgid "Apply this role to all members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 -msgid "Pos." msgstr "" @@ -4724,5 +4845,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -4743,7 +4864,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#, fuzzy msgid "Resolve conflicts." -msgstr "حلل التناقضات" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 @@ -4962,5 +5082,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111 msgid "" msgstr "<مختلف>" @@ -5048,38 +5168,38 @@ #. item "Land use/Quarry" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178 #: build/trans_presets.java:3145 msgid "Relations" msgstr "العلاقات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "إفتح لائحة بكل العلاقات." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 #, java-format msgid "Relations: {0}" msgstr "العلاقات: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286 msgid "Open an editor for the selected relation" msgstr "إفتح محرر نص للعلاقة المحددة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327 msgid "Delete the selected relation" msgstr "أمحي العلاقة المحددة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365 msgid "Create a new relation" msgstr "أنشئ علاقة جديدة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442 msgid "Set the current selection to the list of selected relations" msgstr "" @@ -5108,5 +5228,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5207,5 +5327,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 msgid "Download relation members" msgstr "" @@ -5235,23 +5355,23 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 msgid "" "There is at least one member in this relation referring
to the " @@ -5260,14 +5380,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614 #, java-format msgid "" @@ -5277,9 +5397,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #, java-format msgid "" @@ -5289,15 +5409,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5305,5 +5425,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5311,20 +5431,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:806 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 #, java-format msgid "" @@ -5333,57 +5453,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Move the currently selected members up" msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Move the currently selected members down" msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "" +"Click to to return to the relation editor and to resume relation editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5392,9 +5521,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083 #, java-format msgid "" @@ -5403,41 +5532,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Download all incomplete ways and nodes in relation" msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 msgid "Download Members" msgstr "نزّل الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 #, java-format msgid "" @@ -5447,17 +5576,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -5543,4 +5672,20 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 msgid "Warning: ignoring exception because task was cancelled. Exception was: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39 +msgid "way is connected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42 +msgid "way is connected to previous relation member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45 +msgid "way is connected to next relation member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48 +msgid "way is not connected to previous or next relation member" msgstr "" @@ -5740,65 +5885,95 @@ msgstr "أرقام البلاطة" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:102 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115 #, java-format msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:166 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164 msgid "JOSM Help Browser" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:195 -#, java-format -msgid "Error while loading page {0}" -msgstr "خطء عند تحميل الصفحة {0}" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:223 -#, java-format -msgid "Help page missing. Create it in English." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:226 -#, java-format -msgid "" -"Help page missing. Create it in English or your language." +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187 +#, java-format +msgid "" +"

Help content for help topic missing

Help content for the help topic {0} " +"is not available yet. It is missing both in your local language ({1}) and in " +"english.

Please help to improve the JOSM help system and fill in the " +"missing information.You can both edit the help topic in your " +"local language ({1}) and the help topic in english." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209 +#, java-format +msgid "" +"

Error when retrieving help information

The content for the help topic {0} " +"could not be loaded. The error message is (untranslated):
{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311 +#, java-format +msgid "" +"Failed to open help page for url {0}.
This is most likely due to a " +"network problem, please check your
your internet connection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316 +msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:241 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:253 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:261 -msgid "Can only edit help pages from JOSM Online Help" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368 +#, java-format +msgid "" +"The current URL {0}
is an external URL. Editing is only " +"possible for help topics
on the help server {1}." msgstr "" #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:274 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:289 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:309 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:325 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:70 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 +msgid "Warning: bad location in HTML document. Exception was: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76 msgid "Failed to read command. Exiting help browser. Exception was:" msgstr "" @@ -7129,5 +7304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" msgstr "" @@ -7142,7 +7317,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:871 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 msgid "Tags of new changeset" msgstr "" @@ -7152,17 +7327,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:224 msgid "Objects to add:" msgstr "الأغراض اللتي يجب إضافتها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:230 msgid "Objects to modify:" msgstr "الأغراض اللتي يجب تغييرها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:236 msgid "Objects to delete:" msgstr "الأغراض اللتي يجب حذفها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:271 #, java-format msgid "{0} object to add:" @@ -7171,5 +7346,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 #, java-format msgid "{0} object to modifiy:" @@ -7178,5 +7353,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289 #, java-format msgid "{0} object to delete:" @@ -7185,29 +7360,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 msgid "Upload Changes" msgstr "حمّل التغييرات" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 msgid "Upload the changed primitives" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 -msgid "Please enter a comment for this upload changeset (min. 3 characters)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:482 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 msgid "Cancel the upload and resume editing" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +msgid "Upload all changes in one request" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 -msgid "Upload all changes in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:616 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7215,38 +7390,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:626 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "Provide a brief comment for the changes you are uploading:" msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 msgid "Enter an upload comment (min. 3 characters)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +msgid "Open a new changeset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 -msgid "Open a new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:687 msgid "Open a new changeset and use it in the next upload" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +msgid "Use an open changeset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 -msgid "Use an open changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Upload data to an already opened changeset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +msgid "Close changeset after upload" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 -msgid "Close changeset after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:736 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:927 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 #, java-format msgid "Tags of changeset {0}" @@ -7254,13 +7429,13 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:967 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:966 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:980 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1032 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 @@ -8472,12 +8647,10 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 -#, fuzzy msgid "Projection code" -msgstr "منهج الإسقاط" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 -#, fuzzy msgid "Bounds" -msgstr "الحدود" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:94 @@ -8609,22 +8782,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:205 msgid "Separator" msgstr "الفاصل" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:351 msgid "Toolbar" msgstr "شريط الأدوات" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:355 msgid "Available" msgstr "المتوفّر" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394 msgid "Toolbar customization" msgstr "تخصيص إعتيادات شريط الأدوات" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:395 msgid "Customize the elements on the toolbar." msgstr "تخصيص إعتيادات العناصر على شريط الأدوات" @@ -8781,5 +8954,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" @@ -8787,28 +8960,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 msgid "Optional Attributes:" msgstr "ميزات خيارية:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:521 -#, java-format -msgid "Use preset ''{0}'' of group ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:522 -#, java-format -msgid "Use preset ''{0}''" -msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 msgid "closedway" msgstr "طريق مغلقة الدوران" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 #, java-format msgid "Unknown type: {0}" msgstr "نوع غير معروف: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:649 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -8819,15 +8982,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:657 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #, java-format msgid "Error parsing {0}: " msgstr "خطأ في التحليل النحوي {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 #, java-format msgid "Elements of type {0} are supported." msgstr "العناصر من الفصيلة {0} هي مدعومة" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8841,35 +9004,34 @@ msgstr[5] "غيّر {0} غرض" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "الخيار فارغ !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:733 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 msgid "Selection unsuitable!" msgstr "الخيار غير مناسب !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 msgid "Apply Preset" msgstr "طبّق الخيار المسبق" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:816 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 msgid "Change Properties" msgstr "غيّر الخصائص" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24 -#, java-format -msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 -#, java-format -msgid "Preset group ''{0}''" +#, fuzzy, java-format +msgid "Preset group {1} / {0}" +msgstr "المجموعة المسبقة التعريف ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26 +#, fuzzy, java-format +msgid "Preset group {0}" msgstr "المجموعة المسبقة التعريف ''{0}''" #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 @@ -9534,14 +9696,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:55 #, java-format msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137 +#, fuzzy +msgid "Downloading from OSM Server..." +msgstr "نزّل من أو.أس.أم ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145 msgid "Downloading referring ways ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183 msgid "Downloading referring relations ..." msgstr "" @@ -9704,10 +9871,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75 #, java-format msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84 #, java-format msgid "" @@ -9717,32 +9884,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126 -#, java-format -msgid "" -"Plugin {0} version {1} found but for this version of JOSM is at least " -"version {2} required. Please update the plugin." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140 #, java-format msgid "Plugin not found: {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:180 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159 msgid "" "(You can change the number of days after which this warning appears
by " @@ -9750,21 +9910,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "Disable plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -9772,29 +9932,29 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294 +#, java-format +msgid "" +"An unexpected exception occurred that may have come from the ''{0}'' plugin." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297 +#, java-format +msgid "According to the information within the plugin, the author is {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 +msgid "" +"Try updating to the newest version of this plugin before reporting a bug." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302 +msgid "Should the plugin be disabled?" +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315 -#, java-format -msgid "" -"An unexpected exception occurred that may have come from the ''{0}'' plugin." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318 -#, java-format -msgid "According to the information within the plugin, the author is {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 -msgid "" -"Try updating to the newest version of this plugin before reporting a bug." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323 -msgid "Should the plugin be disabled?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -9802,13 +9962,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320 msgid "The plugin could not be removed. Probably it was already disabled" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364 msgid "Plugin information" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -10107,4 +10267,11 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24 +#, java-format +msgid "" +"Warning: failed to derive wiki language prefix from JOSM locale code " +"''{0}''. Using default code ''en''." +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448 #, java-format @@ -10786,5 +10953,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 #, java-format msgid "" @@ -10797,10 +10964,10 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421 msgid "Error loading file" @@ -10848,13 +11015,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -10863,13 +11030,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273 #, java-format msgid "" @@ -10894,17 +11061,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56 msgid "Enable automatic caching." msgstr "تمكين الإخباء التلقائي" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 msgid "Max. cache size (in MB)" msgstr "حجم الخابية الأقصى (م. بايت)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -10916,18 +11083,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:210 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -10935,5 +11102,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -10941,39 +11108,45 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:115 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:123 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:130 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:166 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:175 msgid "Raster images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 +#. the crosspiece display +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 +#, fuzzy +msgid "Display crosspieces:" +msgstr "أعرض الإحداثيات كــ" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -10990,5 +11163,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22 #, java-format msgid "Downloading {0}" @@ -10997,5 +11170,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:29 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:30 msgid "Contacting WMS Server..." msgstr "" @@ -11055,15 +11228,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:24 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26 msgid "Download Image from French Cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26 #, java-format msgid "Cadastre: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:40 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85 msgid "" @@ -11081,5 +11254,11 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:99 +msgid "" +"This image contains georeference data.\n" +"Do you want to use them ?" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:169 msgid "" "Click first corner for image cropping\n" @@ -11087,14 +11266,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189 msgid "Image cropping" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188 msgid "Click second corner for image cropping" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:208 msgid "" "Click first Lambert crosspiece for georeferencing\n" @@ -11102,14 +11281,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228 msgid "Image georeferencing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:227 msgid "Click second Lambert crosspiece for georeferencing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:245 msgid "" "Do you want to cancel completely\n" @@ -11117,63 +11296,64 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:261 msgid "Enter cadastre east,north position" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262 msgid "(Warning: verify north with arrow !!)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264 msgid "East" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265 msgid "North" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:278 #, java-format msgid "Set {0} Lambert coordinates" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 -msgid "Set manually the Lambert zone (e.g. for locations between two zones)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:32 +msgid "Set manually the Lambert zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43 msgid "Zone" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54 msgid "Lambert zone" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:22 msgid "Load location from cache (only if cache is enabled)" msgstr "حمّل الموقع من الخابية ( فقط عند تمكين الخابية)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:39 +#, java-format +msgid "{0} not allowed with the current projection" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38 -msgid "Open a layer first (GPX, OSM, cache)" -msgstr "إفتح طبقة أولاً ( جي بي إكس، أو أس أم ، خابية)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 #: build/trans_presets.java:2343 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11181,5 +11361,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11194,7 +11374,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41 -#, fuzzy msgid "PNG files (*.png)" -msgstr "صور (*.jpg)JPEG" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49 @@ -11210,4 +11389,19 @@ msgstr[1] "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:33 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +msgid "Adjust WMS" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 +msgid "Adjust the position of the WMS layer (raster images only)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48 +msgid "" +"This mode works only if active layer is\n" +"a cadastre \"plan image\" (raster image)" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 #: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15 @@ -11222,5 +11416,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184 @@ -11228,28 +11422,28 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 #, java-format msgid "" @@ -11258,15 +11452,24 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386 msgid "Cache Format Error" msgstr "خطء في صيغة المعطيات" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535 +#, java-format +msgid "" +"Current layer is in Lambert CC9 Zone \"{0}\"\n" +"where the commune is in Lambert CC9 Zone \"{1}\".\n" +"Upload your changes, close all layers and change\n" +"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12057,7 +12260,6 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:65 -#, fuzzy msgid "Please select 4 ways that form a closed relation." -msgstr "الرجاء إختيار أربعة عقد على الأقل." +msgstr "" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92 @@ -12079,12 +12281,10 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19 -#, fuzzy msgid "Create multipolygon" -msgstr "حرّر متعدد الضلوع" +msgstr "" #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36 -#, fuzzy msgid "Create multipolygon." -msgstr "حرّر متعدد الضلوع" +msgstr "" #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74 @@ -12093,12 +12293,10 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92 -#, fuzzy msgid "Multipolygon must consist only of closed ways." -msgstr "يجب أن يتكون الخيار من طرقات فقط." +msgstr "" #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111 -#, fuzzy msgid "You must select at least two ways." -msgstr "يجب عليك إختيار طريق واحدة على الأقل" +msgstr "" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -13009,13 +13207,22 @@ msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35 +msgid "Coastlines." +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36 -msgid "Coastlines." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37 msgid "This test checks that coastlines are correct." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79 +msgid "Unconnected coastline" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88 +#, fuzzy +msgid "Reversed coastline" +msgstr "أعكس ثم إدمج" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97 msgid "Unordered coastline" msgstr "" @@ -13103,5 +13310,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:57 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:62 msgid "Nodes with same name" msgstr "" @@ -13373,40 +13580,40 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76 #, java-format msgid "natural type {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:83 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79 #, java-format msgid "landuse type {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82 #, java-format msgid "amenities type {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85 #, java-format msgid "sport type {0}" msgstr "نوع الرياضة {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:92 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88 #, java-format msgid "tourism type {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91 #, java-format msgid "shop type {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:98 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94 #, java-format msgid "leisure type {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97 #, java-format msgid "waterway type {0}" @@ -13502,5 +13709,5 @@ #. #. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 #: build/trans_style.java:4159 build/trans_style.java:4166 #: build/trans_style.java:4173 build/trans_style.java:4180 @@ -13516,10 +13723,10 @@ #. #. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:107 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 #: build/trans_style.java:4194 msgid "area" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:126 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:122 msgid "Unclosed way" msgstr "" @@ -13633,4 +13840,8 @@ #, java-format msgid "Walking Papers: {0}" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27 +msgid "Walking Papers" msgstr "" @@ -13741,8 +13952,4 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201 msgid "No valid WMS URL or id" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 -msgid "Adjust WMS" msgstr "" @@ -14895,12 +15102,4 @@ msgstr "" -#. color heath -#. 1 -#. 50000 -#. -#. -#. -#. -#. #: build/trans_presets.java:254 build/trans_presets.java:272 #: build/trans_presets.java:291 build/trans_presets.java:306 @@ -14910,5 +15109,4 @@ #: build/trans_presets.java:521 build/trans_presets.java:677 #: build/trans_presets.java:1320 build/trans_presets.java:2469 -#: build/trans_style.java:3375 msgid "wood" msgstr "غابة/حرش" @@ -20553,4 +20751,9 @@ #: build/trans_presets.java:2470 +#, fuzzy +msgid "gray" +msgstr "ألماني" + +#: build/trans_presets.java:2470 msgid "white" msgstr "" @@ -22405,5 +22608,5 @@ #. #. -#. color wood +#. color woodarea #. 1 #. 50000 @@ -25561,4 +25764,17 @@ msgstr "أرض بور" +#. color heath +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#: build/trans_style.java:3375 +#, fuzzy +msgid "woodarea" +msgstr "غابة/حرش" + #. color water #. 1 @@ -26215,60 +26431,60 @@ msgstr "" -#~ msgid "History of Element" -#~ msgstr "الخط الزمني للعنصر" +#~ msgid "Error while loading page {0}" +#~ msgstr "خطء عند تحميل الصفحة {0}" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''" + +#~ msgid "Open a layer first (GPX, OSM, cache)" +#~ msgstr "إفتح طبقة أولاً ( جي بي إكس، أو أس أم ، خابية)" + +#~ msgid "Unknown version" +#~ msgstr "نسخة مجهولة" + +#~ msgid "Aborting..." +#~ msgstr "إجهاض..." + +#~ msgid "false" +#~ msgstr "خاطئ" + +#~ msgid "true" +#~ msgstr "حقيقي" + +#~ msgid "different" +#~ msgstr "مختلف" + +#~ msgid "Rotate" +#~ msgstr "أدر" + +#~ msgid "Move" +#~ msgstr "حرك" + +#~ msgid "unnamed" +#~ msgstr "غيرمسمى" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟" + +#~ msgid "No document open so nothing to save." +#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء." + +#~ msgid "Unknown file extension." +#~ msgstr "إمتداد ملف غير معروف." + +#~ msgid "Email" +#~ msgstr "البريد الإلكتروني" #~ msgid "Only two nodes allowed" #~ msgstr "مسموح فقط عقدتين" -#~ msgid "Only one node selected" -#~ msgstr "عقدة واحدة محددة فقط" - -#~ msgid "Merging conflicts." -#~ msgstr "دمج التناقضات." +#~ msgid "No data imported." +#~ msgstr "لم يتم تحميل أي معطيات" + +#~ msgid "Data Layer" +#~ msgstr "طبقة المعطيات" #~ msgid "Open in Browser" #~ msgstr "إفتح في المتصفح" - -#~ msgid "Unknown version" -#~ msgstr "نسخة مجهولة" - -#~ msgid "Aborting..." -#~ msgstr "إجهاض..." - -#~ msgid "false" -#~ msgstr "خاطئ" - -#~ msgid "true" -#~ msgstr "حقيقي" - -#~ msgid "different" -#~ msgstr "مختلف" - -#~ msgid "Rotate" -#~ msgstr "أدر" - -#~ msgid "Move" -#~ msgstr "حرك" - -#~ msgid "unnamed" -#~ msgstr "غيرمسمى" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟" - -#~ msgid "No document open so nothing to save." -#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء." - -#~ msgid "Unknown file extension." -#~ msgstr "إمتداد ملف غير معروف." - -#~ msgid "Email" -#~ msgstr "البريد الإلكتروني" - -#~ msgid "No data imported." -#~ msgstr "لم يتم تحميل أي معطيات" - -#~ msgid "Data Layer" -#~ msgstr "طبقة المعطيات" #~ msgid "citymap" @@ -26329,4 +26545,7 @@ #~ msgstr "خطأ عند التحليل النحوي لردّ المخدم." +#~ msgid "Merging conflicts." +#~ msgstr "دمج التناقضات." + #~ msgid "Conflicts: {0}" #~ msgstr "التناقضات: {0}" @@ -26367,4 +26586,7 @@ #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "غير قادر على فتح دليل التفضيلات: {0}" + +#~ msgid "History of Element" +#~ msgstr "الخط الزمني للعنصر" #~ msgid "Combine ways with different memberships?" @@ -26385,4 +26607,7 @@ #~ msgid "Merge Anyway" #~ msgstr "ادمجعلى كلّ حال" + +#~ msgid "Only one node selected" +#~ msgstr "عقدة واحدة محددة فقط" #~ msgid "Update Data"