Index: applications/editors/josm/i18n/po/ar.po =================================================================== --- applications/editors/josm/i18n/po/ar.po (revision 18863) +++ applications/editors/josm/i18n/po/ar.po (revision 18975) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" -"PO-Revision-Date: 2009-11-29 14:31+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-11-29 22:18+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-11-29 21:07+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -30,6 +30,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:298 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -46,7 +46,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125 @@ -62,19 +62,18 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 -#: ../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/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -87,9 +86,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" @@ -117,5 +116,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -138,9 +137,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 @@ -156,20 +155,16 @@ #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:343 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:49 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:241 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1098 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:149 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 @@ -188,7 +183,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:434 msgid "Error" msgstr "خطأ" @@ -268,5 +263,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83 #: ../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:269 msgid "Plugins" msgstr "إضافات" @@ -307,4 +302,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 @@ -312,8 +309,8 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../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:356 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -323,29 +320,27 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 #: ../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:516 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 @@ -374,6 +369,6 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." +"There are no layers the source layer
''{0}''
could be merged to." +"" msgstr "" @@ -425,14 +420,14 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 msgid "Latitude" msgstr "خط العرض" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 msgid "Longitude" msgstr "خط الطول" @@ -458,10 +453,10 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -492,19 +487,22 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32 @@ -513,9 +511,6 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 #: ../plugins/terracer/src/terracer/TerracerAction.java:72 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 #, java-format @@ -531,7 +526,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 @@ -543,11 +538,11 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69 -#: ../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:337 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:371 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:661 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:87 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 msgid "Information" @@ -635,5 +630,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 #, java-format msgid "File: {0}" @@ -676,6 +671,5 @@ "The ways can not be combined in their current directions. Do you want to " "reverse some of them?" -msgstr "" -"لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟" +msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66 @@ -685,10 +679,10 @@ msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:220 #, 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:245 msgid "Please select at least two ways to combine." msgstr "الرجاء إختر على الأقل طريقتين للدمج." @@ -707,19 +701,19 @@ msgstr "الرجاء إختيار شيء للنسخ." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 msgid "Create Circle" msgstr "إنشاء حلقة" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "كوّن مستديرة من ثلاث عقد مختارة." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." msgstr "هذه العقد لا تشكل دائرة. جاري الإجهاض العملية." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -730,9 +724,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:380 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 @@ -804,21 +798,25 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:236 #: ../core/src/org/openstreetmap/josm/command/Command.java:66 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:73 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:89 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:218 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:87 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:216 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:50 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112 -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184 #, java-format msgid "Parameter ''{0}'' must not be null" @@ -826,6 +824,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:481 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format @@ -854,5 +852,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333 msgid "Duplicate" msgstr "نسخة مطابقة" @@ -909,8 +907,6 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:172 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:174 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266 @@ -918,5 +914,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 -#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 +#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 @@ -929,8 +925,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:67 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:69 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:112 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 @@ -949,8 +945,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:123 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 @@ -973,13 +969,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -1019,4 +1016,100 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 +msgid "" +"The selected way(s) have nodes outside of the downloaded data region.\n" +"This can lead to nodes being deleted accidentally.\n" +"Are you really sure to continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 +msgid "Please abort if you are not sure" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgid "No intersection found. Nothing was changed." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgid "Added node on all intersections" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 +msgid "" +"Some of the ways were part of relations that have been modified. Please " +"verify no errors have been introduced." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "ادخل القيم لكل التناقضات." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "حلل التناقضات" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 @@ -1036,4 +1129,45 @@ msgstr "لا إختصار" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1044,26 +1178,26 @@ msgstr "أدمج الطبقة الحالية في طبقة أخرى" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48 msgid "Merge Nodes" msgstr "إدمج العقد" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46 msgid "Merge nodes into the oldest one." msgstr "ادمج العقد إلى العقدة الأعتق." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:59 msgid "Please select at least two nodes to merge." msgstr "الرجاء إختيار على الأقل عقدتين للدمج." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128 msgid "Click to abort merging nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 #, java-format msgid "" @@ -1071,5 +1205,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1440,6 +1574,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 -msgid "" -"Show status report with useful information that can be attached to bugs" +msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1459,9 +1592,41 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 msgid "Close" msgstr "اغلق" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87 +#, java-format +msgid "The selection contains {0} way. Are you sure you want to simplify it?" +msgid_plural "" +"The selection contains {0} ways. Are you sure you want to simplify them all?" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67 +#, java-format +msgid "Simplify Way (remove {0} node)" +msgid_plural "Simplify Way (remove {0} nodes)" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1588,6 +1753,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 -msgid "" -"* One node that is used by more than one way and one of those ways, or" +msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" @@ -1663,54 +1827,54 @@ #. bounds defined? => use the bbox downloader -#. +#. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Update selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +msgid "There are no selected objects to update." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 -msgid "There are no selected objects to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 msgid "Update objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" @@ -1719,35 +1883,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125 msgid "No changes to upload." msgstr "لا يوجد تغييرات للتحميل." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 msgid "Nothing to upload. Get some data first." msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize node {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 #, java-format msgid "Synchronize way {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234 #, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1755,28 +1919,26 @@ "version of one
of your nodes, ways, or relations.
The conflict is " "caused by the {0} with id {1},
the " -"server has version {2}, your version is {3}.

Click " -"{4} to synchronize the conflicting primitive only.
Click " -"{5} to synchronize the entire local dataset with the " -"server.
Click {6} to abort and continue " -"editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 +"server has version {2}, your version is {3}.

Click {4} to synchronize the conflicting primitive only.
Click {5} to synchronize the entire local dataset with the server.
Click " +"{6} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304 #, java-format msgid "" "Uploading failed because the server has a newer " -"version of one
of your nodes, ways, or relations.

Click " -"{0} to synchronize the entire local dataset with the " -"server.
Click {1} to abort and continue " -"editing.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"version of one
of your nodes, ways, or relations.

Click {0}" +" to synchronize the entire local dataset with the server.
Click " +"{1} to abort and continue editing.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1786,22 +1948,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 msgid "Prepare conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1812,15 +1974,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 msgid "Updating primitive" msgstr "" @@ -1832,6 +1994,6 @@ #. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "" @@ -1840,38 +2002,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 -#, java-format -msgid "" -"Ignoring caught exception because upload is canceled. Exception is: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 msgid "Upload selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46 msgid "Upload all changes in the current selection to the OSM server." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:258 msgid "Checking parents for deleted objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:318 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:317 #, java-format msgid "Reading parents of ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:324 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:323 msgid "Checking for deleted parents in the local dataset" msgstr "" @@ -2035,6 +2196,6 @@ "deleted on the server. If you later try to delete or
update them the " "server is likely to report a
conflict.

Click {1} " -"to check the state of these primitives
on the server.
Click " -"{2} to ignore.
" +"to check the state of these primitives
on the server.
Click {2}" +" to ignore.
" msgstr "" @@ -2101,38 +2262,38 @@ msgstr "مُنتقى" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 msgid "Cannot add a node outside of the world." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "أضافة عقدة" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537 msgid "Add node into way" msgstr "إضافة عقدة إلى طريق" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:546 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545 msgid "Connect existing way to node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:548 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547 msgid "Add a new node to an existing way" msgstr "إضافة عقدة جديدة إلى طريق موجودة" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:550 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549 msgid "Add node into way and connect" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 msgid "Create new node." msgstr "انشئ عقدة جديدة" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:944 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:968 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967 msgid "Select node under cursor." msgstr "إختر العقدة الموجودة تحت المزلاق." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:946 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 #, java-format msgid "Insert new node into way." @@ -2141,14 +2302,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:956 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955 msgid "Start new way from last node." msgstr "إبدء طريق جديدة من العقدة الأخيرة." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:958 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 msgid "Continue way from last node." msgstr "تابع طريق من العقدة الأخيرة." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:981 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980 msgid "Finish drawing." msgstr "إنهي الرسم." @@ -2183,6 +2344,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 msgid "" -"Drag play head and release near track to play audio from there; " -"SHIFT+release to synchronize audio at that point." +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." msgstr "" @@ -2277,5 +2438,5 @@ #. -- prepare the combo box with the search expressions -#. +#. #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." @@ -2358,12 +2519,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "المستخدم:... - كلّ الأغراض اللتي قام المستخدم بتغييرها" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "العقد:... - الغرض ذات عدد العقد المحدد" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2371,43 +2537,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "modified - all changed objects" msgstr "مغيير - كلّ الأغراض المغييرة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "selected - all selected objects" msgstr "المختارة - كلّ الأغراض المختارة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "incomplete - all incomplete objects" msgstr "غير المكتملة - كلّ الأغراض غير المكتملة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "untagged - all untagged objects" msgstr "غير المسمات - كلّ الأغراض غير المسمات" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "إستعمل | أو أو للدمج بالأو المنطقي" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2417,55 +2583,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "إبحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Start Search" msgstr "إبدء البحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 #, java-format msgid "No match found for ''{0}''" msgstr "لم أجد شيء مطابق لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 #, java-format msgid "Found {0} matches" msgstr "وجدتُ {0} مطابقات" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2475,40 +2641,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 #, java-format msgid "" @@ -2517,9 +2683,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2528,5 +2694,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2577,6 +2743,5 @@ #, java-format msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" @@ -2584,5 +2749,5 @@ #, java-format msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2719,5 +2884,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 msgid "Double conflict" msgstr "" @@ -2736,5 +2901,6 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:214 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 #, java-format msgid "" @@ -2753,19 +2919,19 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:57 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:103 +#, java-format +msgid "Parameter ''{0}'' must not be empty" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 +msgid "At least one object to delete required, got empty collection" +msgstr "" + #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 -#, java-format -msgid "Parameter ''{0}'' must not be empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 -msgid "At least one object to delete required, got empty collection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:107 msgid "At least one object to delete requird, got empty collection" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 #, java-format msgid "Delete {0} object" @@ -2774,5 +2940,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2781,5 +2947,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2788,5 +2954,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2797,13 +2963,13 @@ #. leave message in one tr() as there is a grammatical #. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139 -msgid "" -"You are about to delete nodes outside of the area you have " -"downloaded.
This can cause problems because other objects (that you don't " -"see) might use them.
Do you really want to delete?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2821,15 +2987,15 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 #, java-format msgid "Purged {0} objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -2838,5 +3004,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 #, java-format msgid "Removing reference from relation {0}" @@ -2846,9 +3012,4 @@ #, java-format msgid "Resolve conflicts in member list of relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2928,5 +3089,5 @@ msgstr "طبّق ؟" -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173 msgid "" "When reversing this way, the following changes to properties of the way and " @@ -3069,6 +3230,6 @@ #, java-format msgid "" -"Preferences file had errors.
Making backup of old one to " -"
{0}
and creating a new default preference file." +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." msgstr "" @@ -3151,5 +3312,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3158,5 +3319,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3164,25 +3325,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 msgid "S" msgstr "ج." #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77 msgid "N" msgstr "ش." #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 msgid "W" msgstr "غ." #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91 msgid "E" msgstr "ش." #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3205,25 +3366,26 @@ #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246 +#, java-format +msgid "Missing merge target for node with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 -#, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3231,6 +3393,6 @@ #. should not happen -#. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#. +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298 #, java-format msgid "" @@ -3293,24 +3455,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3318,5 +3480,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 #, java-format msgid "" @@ -3348,6 +3510,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3368,5 +3530,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:33 -#: ../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 @@ -3378,6 +3539,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 #, java-format -msgid "" -"Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." +msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." msgstr "" @@ -3388,135 +3548,135 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:476 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456 #, java-format msgid "multipolygon way ''{0}'' is not closed." msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:922 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "أمحي العضو ''{0}'' في العلاقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:930 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546 +#: ../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:579 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 #, java-format msgid "Unknown role ''{0}''." msgstr "دور غير معروف ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 #, java-format msgid "Unknown member type for ''{0}''." msgstr "نوع عضو غير معروف لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 msgid "No \"from\" way found." msgstr "لم أجد طريق \"من\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 msgid "No \"to\" way found." msgstr "لم أجد طريق \"إلى\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +msgid "The \"to\" way doesn't start or end at a \"via\" node." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 -msgid "The \"to\" way doesn't start or end at a \"via\" node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:795 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:903 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "الطريق الداخلية ''{0}''موجودة في الخارج." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:994 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1054 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1084 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1392 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1393 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321 msgid "text" msgstr "النص" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1394 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322 msgid "areatext" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1643 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 #, java-format msgid "Error: {0}" msgstr "خطأ : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1643 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475 #, java-format msgid "Warning: {0}" @@ -3528,5 +3688,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 @@ -3553,5 +3713,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 @@ -3575,5 +3735,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 msgid "background" msgstr "الخلفية" @@ -3691,6 +3851,5 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 #, java-format -msgid "" -"Could not read bookmarks from
''{0}''
Error was: {1}" +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" msgstr "" @@ -3705,5 +3864,5 @@ msgstr "لا تظهر مرة اخرى" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3711,32 +3870,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 msgid "incomplete" msgstr "غير كامل" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "من النوع طريق" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 #: build/trans_presets.java:3186 msgid "railway" msgstr "خط سكة حديد" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "مجرى مياه" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "إستعمال الأرض" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 #, java-format msgid "{0} node" @@ -3749,5 +3908,5 @@ msgstr[5] "{0} عقد" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3988,12 +4147,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "الملفّ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 @@ -4007,19 +4166,19 @@ msgstr "حرّر" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "العرض" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24 msgid "Tools" msgstr "العدة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "التعيينات المسبقة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44 @@ -4030,5 +4189,5 @@ msgstr "اللائحة: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "سمعيّ" @@ -4072,29 +4231,29 @@ msgstr "المقياس" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The geographic longitude at the mouse pointer." msgstr "خطّ الطول عند مؤشر الفأرة." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The name of the object at the mouse pointer." msgstr "إسم الغرض عند مؤشر الفأرة." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102 msgid "The geographic latitude at the mouse pointer." msgstr "خطّ العرض عند مؤشر الفأرة." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103 msgid "The angle between the previous and the current way segment." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104 msgid "The (compass) heading of the line segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4102,9 +4261,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(لا يوجد أي غرض)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4210,5 +4369,5 @@ #. * #. * compare my version of an {@see OsmPrimitive} with their version -#. +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17 msgid "My with Their" @@ -4217,5 +4376,5 @@ #. * #. * compare my version of an {@see OsmPrimitive} with the merged version -#. +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22 msgid "My with Merged" @@ -4224,5 +4383,5 @@ #. * #. * compare their version of an {@see OsmPrimitive} with the merged veresion -#. +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27 msgid "Their with Merged" @@ -4241,5 +4400,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 @@ -4256,5 +4415,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4326,22 +4485,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:322 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:374 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:610 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:759 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:773 #, java-format msgid "Item {0} not found in list." @@ -4420,6 +4579,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 -msgid "" -"Copy their selected elements to the end of the list of merged elements." +msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" @@ -4488,6 +4646,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4495,6 +4653,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4551,6 +4709,6 @@ #, java-format msgid "" -"An error occurred while communicating with the server
Details: " -"{0}" +"An error occurred while communicating with the server
Details: {0}" msgstr "" @@ -4583,7 +4741,7 @@ #, java-format msgid "" -"There are {0} additional primitives referred to by relation " -"{1}
which are deleted on the server.

Do you want to undelete them " -"too?" +"There are {0} additional primitives referred to by relation {1}" +"
which are deleted on the server.

Do you want to undelete them too?" +"" msgstr "" @@ -4729,5 +4887,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114 msgid "Merged nodes not frozen yet. Can't build resolution command" msgstr "" @@ -4862,5 +5020,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 msgid "Apply" msgstr "" @@ -4960,7 +5118,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 #, java-format msgid "{0} way" @@ -4974,6 +5132,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 #, java-format msgid "{0} relation" @@ -5007,7 +5165,5 @@ msgstr "" -#. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5096,5 +5252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 @@ -5159,10 +5315,9 @@ #, java-format msgid "" -"You didn''t finish to merge the differences in this " -"conflict.
Conflict resolutions won't be applied unless all " -"differences
are resolved.Click {0} to close " -"anyway.Already
resolved differences won't be " -"applied.
Click {1} to return to resolving " -"conflicts." +"You didn''t finish to merge the differences in this conflict." +"
Conflict resolutions won't be applied unless all differences
are " +"resolved.Click {0} to close anyway." +"Already
resolved differences won't be applied.
Click " +"{1} to return to resolving conflicts." msgstr "" @@ -5237,18 +5392,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133 msgid "History" msgstr "الخط الزمني" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132 msgid "Display the history of all selected items." msgstr "أعرض الخط الزمني للبنود المختارة." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:246 msgid "Object with history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 @@ -5258,13 +5413,13 @@ msgstr "أعد التحميل" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264 msgid "Reload all currently selected objects and refresh the list." msgstr "إعادة تعبئة كلّ الأغراض المختارة حالياً ثم أنعش اللائحة." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304 msgid "Display the history of the selected objects." msgstr "" @@ -5457,5 +5612,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5498,30 +5653,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "الخيار" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335 #, java-format msgid "Selection: {0}" msgstr "الخيار: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:355 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:366 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 msgid "Click to minimize/maximize the panel content" msgstr "أنقر لتكبير/تصغير محتويات اللوحة" @@ -5581,37 +5736,37 @@ msgstr "رقم الغرض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 msgid "Edit the relation the currently selected relation member refers to." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220 msgid "Download all child relations (recursively)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 msgid "Download All Children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241 msgid "Download selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245 msgid "Download Selected Children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:446 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:41 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342 #, java-format msgid "" @@ -5620,63 +5775,95 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351 msgid "Relation is deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517 #, java-format msgid "Downloading relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85 +#, fuzzy, java-format +msgid "Downloading {0} incomplete child of relation ''{1}''" +msgid_plural "Downloading {0} incomplete children of relation ''{1}''" +msgstr[0] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" +msgstr[1] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" +msgstr[2] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" +msgstr[3] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" +msgstr[4] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" +msgstr[5] "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "موقع التنزيل" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 #: ../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: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:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 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:291 +#, fuzzy +msgid "Apply Role:" +msgstr "طبّق الخيار المسبق" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#, fuzzy +msgid "Enter a role and apply it to the selected relation members" +msgstr "إفتح محرر نص للعلاقة المحددة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 msgid "" "There is at least one member in this relation referring
to the " -"relation itself.
This creates circular dependencies and is " -"discouraged.
How do you want to proceed with circular dependencies?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 +"relation itself.
This creates circular dependencies and is discouraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 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:569 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:592 #, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation " -"member?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +"primitive ''{0}''

Do you really want to add another relation member?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 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:620 #, java-format msgid "" @@ -5686,15 +5873,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 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:687 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:714 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5702,5 +5889,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5708,20 +5895,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 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:804 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 #, java-format msgid "" @@ -5730,66 +5917,70 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871 msgid "Sort the relation members" msgstr "" -#. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 +#, fuzzy +msgid "Sort" +msgstr "رياضة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 msgid "Move the currently selected members up" msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 msgid "Move the currently selected members down" msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041 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:1043 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047 msgid "No, continue editing" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 +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:1056 -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:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5798,53 +5989,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for " -"primitive
''{1}''.
Please resolve this conflict first, then try " -"again." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 -msgid "Download all incomplete ways and nodes in relation" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 msgid "Download Members" msgstr "نزّل الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +msgid "Download selected incomplete members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 #, java-format msgid "" @@ -5854,41 +6051,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279 msgid "No, don't apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#. download the relation -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 -#, java-format -msgid "Downloading relation ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 msgid "Zoom to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222 msgid "Zoom to the object the first selected member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213 msgid "Zooming disabled because layer of this relation is not active" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218 msgid "Zooming disabled because there is no selected member" msgstr "" @@ -5928,19 +6118,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119 msgid "Apply Changes" msgstr "طبّق التغيرات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:133 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:135 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:137 #, java-format msgid "Edit relation #{0} in layer ''{1}''" @@ -5952,6 +6142,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 -msgid "" -"Warning: ignoring exception because task was cancelled. Exception was: " +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -6129,7 +6318,6 @@ #, java-format msgid "" -"Neither {0} nor {1} is " -"enabled.
Please chose to either download OSM data, or GPX data, or " -"both." +"Neither {0} nor {1} is enabled." +"
Please chose to either download OSM data, or GPX data, or both." msgstr "" @@ -6902,5 +7090,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 @@ -7137,6 +7325,6 @@ "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.

" +"local language ({1}) and the help topic in english." msgstr "" @@ -7146,6 +7334,6 @@ "

Error when retrieving help information

The content for the help topic {0} " -"could not be loaded. The error message is " -"(untranslated):
{1}

" +"could not be loaded. The error message is (untranslated):
{1}" msgstr "" @@ -7408,13 +7596,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Changeset info" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 msgid "Launch browser with information about the changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140 #, java-format msgid "Show changeset {0}" @@ -7515,6 +7703,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format -msgid "" -"Layer ''{0}'' has modifications which should be uploaded to the server." +msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" @@ -7599,6 +7786,6 @@ msgid_plural "" "{0} layers need saving but have no associated file.
Either select a " -"file for each of them or discard the changes.
Layers without a " -"file:" +"file for each of them or discard the changes.
Layers without a file:" msgstr[0] "" msgstr[1] "" @@ -7612,6 +7799,6 @@ msgid "" "{0} layer needs saving but has an associated file
which can't be " -"written.
Either select another file for this layer or discard the " -"changes.
Layer with a non-writable file:" +"written.
Either select another file for this layer or discard the changes." +"
Layer with a non-writable file:" msgid_plural "" "{0} layers need saving but have associated files
which can't be " @@ -7666,5 +7853,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482 msgid "" "An upload and/or save operation of one layer with modifications
was " @@ -7672,5 +7859,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 msgid "Incomplete upload and/or save" msgstr "" @@ -7743,40 +7930,40 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204 msgid "Upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 msgid "Decide how to upload the data and which changeset to use" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009 msgid "Tags of new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156 msgid "Apply tags to the changeset data is uploaded to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225 msgid "Objects to add:" msgstr "الأغراض اللتي يجب إضافتها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:230 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231 msgid "Objects to modify:" msgstr "الأغراض اللتي يجب تغييرها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:236 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237 msgid "Objects to delete:" msgstr "الأغراض اللتي يجب حذفها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272 #, java-format msgid "{0} object to add:" @@ -7785,5 +7972,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281 #, java-format msgid "{0} object to modify:" @@ -7792,5 +7979,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290 #, java-format msgid "{0} object to delete:" @@ -7799,69 +7986,67 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "حمّل التغييرات" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513 +#, fuzzy +msgid "Please enter a valid chunk size first" +msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514 +msgid "Illegal chunk size" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 -msgid "Upload all changes in one request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 -msgid "" -"Enable to upload all changes in one request, disable to use one request per " -"changed primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658 msgid "Provide a brief comment for the changes you are uploading:" -msgstr "" -"الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021 #, java-format msgid "Tags of changeset {0}" @@ -7869,16 +8054,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7886,6 +8071,6 @@ #. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91 +#. +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98 #, java-format msgid "" @@ -7894,5 +8079,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 msgid "Preparing primitives to upload ..." msgstr "" @@ -7922,115 +8107,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "الصول لِــ {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "إقرءGPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "لا توقيت للنقطة {0} x {1}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 -#, java-format -msgid "Cannot read time \"{0}\" from point {1} x {2}" -msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 -#, java-format -msgid "Reading {0}..." -msgstr "جاري قراءة {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 -msgid "Geotagged Images" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "الإنحراف الحالي: {0}ث" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "إختلاف في التوقيت الجغرافي: " - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 -msgid "image" -msgid_plural "images" -msgstr[0] "صورة" -msgstr[1] "صورتين" -msgstr[2] "صور" -msgstr[3] "صورة" -msgstr[4] "صور" -msgstr[5] "صور" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} من ضمن المسلك." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 -msgid "JPEG images (*.jpg)" -msgstr "صور (*.jpg)JPEG" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "الصورة" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 -msgid "Time entered could not be parsed." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +msgid "Upload data in one request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90 +msgid "Upload data in chunks of objects. Chunk size: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115 +msgid "Upload each object individually" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206 +msgid "(1 request)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217 +msgid "(# requests unknown)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221 +#, fuzzy, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "{0} أمتار" +msgstr[1] "{0} أمتار" +msgstr[2] "{0} أمتار" +msgstr[3] "{0} أمتار" +msgstr[4] "{0} أمتار" +msgstr[5] "{0} أمتار" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260 +msgid "Illegal chunk size <= 0. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262 +#, fuzzy +msgid "Please enter an integer > 1" +msgstr "الرجاء إدخال إسم المستخدم" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 +#, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 @@ -8038,30 +8167,30 @@ msgstr "نقطة gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Customize line drawing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 msgid "Use global settings." msgstr "إستعمل الإعدادات العامة." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203 msgid "Draw lines between points for this layer." msgstr "أرسم خطوط بين النقاط لهذه الطبقة." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 msgid "Do not draw lines between points for this layer." msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 msgid "Select line drawing options" msgstr "حدد خيارات رسم الخطوط" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196 @@ -8069,5 +8198,5 @@ msgstr "خصّص اللون" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -8076,5 +8205,5 @@ msgstr "الغيابي" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 @@ -8083,58 +8212,63 @@ msgstr "إختر لون" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "إستورد صوت مسجل" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218 -#, java-format -msgid "" -"The data in the GPX layer ''{0}'' has been downloaded from the " -"server.
Because its way points don''t include a timestamp we can''t " -"correlate them with audio data." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219 +#, java-format +msgid "" +"The data in the GPX layer ''{0}'' has been downloaded from the server." +"
Because its way points don''t include a timestamp we can''t correlate " +"them with audio data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:313 msgid "Import not possible" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248 msgid "Wave Audio files (*.wav)" msgstr "ملفات صوتيت (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284 #, java-format msgid "Audio markers from {0}" msgstr "العلامات الصوتية من {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301 msgid "Import images" msgstr "إستورد صور" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305 -#, java-format -msgid "" -"The data in the GPX layer ''{0}'' has been downloaded from the " -"server.
Because its way points don''t include a timestamp we can''t " -"correlate them with images." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 +#, java-format +msgid "" +"The data in the GPX layer ''{0}'' has been downloaded from the server." +"
Because its way points don''t include a timestamp we can''t correlate " +"them with images." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:336 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31 +msgid "JPEG images (*.jpg)" +msgstr "صور (*.jpg)JPEG" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189 #, java-format msgid "Name: {0}" msgstr "الإسم: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format @@ -8142,5 +8276,5 @@ msgstr "الوصف: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:388 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:389 #, java-format msgid "{0} track" @@ -8150,5 +8284,5 @@ #. item "Relations/Route" text "Symbol description" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 #: build/trans_presets.java:3190 @@ -8156,22 +8290,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 msgid "Timespan" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "Length" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 -msgid "URL" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "الطول: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446 #, java-format msgid "{0} route, " @@ -8180,5 +8309,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:447 #, java-format msgid "{0} waypoint" @@ -8187,24 +8316,24 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 -msgid "" -"Upload of unprocessed GPS data as map data is considered " -"harmful.
If you want to upload traces, look here:" -msgstr "" -"إنّ تحميل معطيات جهاز تحديد المواقع العالمي غير المعالجة مسبقاً قد " -"تكون مضرة.
أنظر هنا إذا أردت تحميل بعض الأثرات:" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 +msgid "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" +msgstr "" +"إنّ تحميل معطيات جهاز تحديد المواقع العالمي غير المعالجة مسبقاً قد تكون " +"مضرة.
أنظر هنا إذا أردت تحميل بعض الأثرات:" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8214,29 +8343,29 @@ msgstr "محوّل من: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970 msgid "Download from OSM along this track" msgstr "نزّل من أو.أس.أم على طول هذا المسلك" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854 msgid "Download everything within:" msgstr "نزّل كلّ شيئ بين:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857 #, java-format msgid "{0} meters" msgstr "{0} أمتار" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861 msgid "Maximum area per request:" msgstr "المساحة القصوى للمطلب:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864 #, java-format msgid "{0} sq km" msgstr "{0} كلم²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8245,9 +8374,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8255,5 +8384,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8261,23 +8390,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111 #, java-format msgid "Data Layer {0}" msgstr "طبقة المعطيات {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 msgid "outside downloaded area" msgstr "خارج عن المنطقة المنزلة" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 #, java-format msgid "There was {0} conflict detected." @@ -8286,5 +8415,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 #, java-format msgid "" @@ -8298,5 +8427,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 #, java-format msgid "" @@ -8309,11 +8438,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 #, java-format msgid "{0} deleted" @@ -8322,32 +8451,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} consists of:" msgstr "{0} يتألف من:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721 msgid "Dataset consistency test" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 +msgid "No problems found" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 -msgid "No problems found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 msgid "Following problems found:" msgstr "" @@ -8355,6 +8484,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 msgid "" -"Upload of unprocessed GPS data as map data is considered " -"harmful.
If you want to upload traces, look here:" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" msgstr "" @@ -8401,4 +8530,347 @@ msgstr[5] "{0} نقطة" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "خطء عند تحليل {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "لم أتمكن من قراءة \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224 +msgid "" +"Take a photo of your GPS receiver while it displays the time." +"
Display that photo here.
And then, simply capture the time you read " +"on the photo and select a timezone
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376 +msgid "No date" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +msgid "GPX track: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510 +msgid "I can take a picture of my GPS receiver.
Can this help?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730 +msgid "" +"The selected GPX track doesn't contain timestamps. Please select another one." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 +msgid "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +msgid "Matching photos to track failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +msgid "One of the selected files was null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144 +msgid "Read photos..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "جاري قراءة {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#, java-format +msgid "Unable to get canonical path for directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +msgid "Geotagged Images" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "صورة" +msgstr[1] "صورتين" +msgstr[2] "صور" +msgstr[3] "صورة" +msgstr[4] "صور" +msgstr[5] "صور" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481 +#, java-format +msgid "Error on file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "إعدادات المعراض" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80 +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 +msgid "Previous" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 +msgid "Next" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8700,5 +9172,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8890,6 +9362,5 @@ #. drawGpsArrowsFast #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135 -msgid "" -"Draw the direction arrows using table lookups instead of complex math." +msgid "Draw the direction arrows using table lookups instead of complex math." msgstr "" "أرسم سهام الإتجاه حسب البحث في الجدول بدلاً عن إستعمال الرياضيات الصعبة." @@ -8949,6 +9420,5 @@ #. antialiasing #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242 -msgid "" -"Apply antialiasing to the map view resulting in a smoother appearance." +msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" @@ -9016,19 +9486,19 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109 -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:79 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70 msgid "Look and Feel" msgstr "الشكل و المظهر" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "اللغة" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113 +msgid "Looking up available translations..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196 msgid "Default (Auto determined)" msgstr "الغيابي (محدد تلقائياً)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "اللغة" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:112 -msgid "Looking up available translations..." -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35 @@ -9288,6 +9758,6 @@ #, java-format msgid "" -"Failed to load the list of style sources " -"from
''{0}''.

Details (untranslated):
{1}" +"Failed to load the list of style sources from
''{0}''." +"

Details (untranslated):
{1}" msgstr "" @@ -9350,6 +9820,6 @@ "a menu entry of button for the first time. So some of your changes may " "become active even without restart --- but also without collistion handling. " -"This is another reason to restart JOSM after making any changes " -"here.

" +"This is another reason to restart JOSM after making any changes here." +"

" msgstr "" @@ -9362,9 +9832,8 @@ "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also " "there will be 'keys' listed that correspond to a shortcut on your keyboard " -"(e.g. ':'/Colon). Please also do not use them, use the base key " -"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) " -"instead. Not doing so may result in conflicts, as there is no way for JOSM " -"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " -"keyboard...

" +"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/" +"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not " +"doing so may result in conflicts, as there is no way for JOSM to know that " +"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

" msgstr "" @@ -9388,6 +9857,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

The pseudo-modifier 'disabled' will disable the shortcut when " -"encountered.

" +"

The pseudo-modifier 'disabled' will disable the shortcut when encountered." +"

" msgstr "" @@ -9480,5 +9949,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "مزيد من المعلومات عن هذه الميزة" @@ -9569,5 +10038,5 @@ msgstr "جاري تحميل النقاط {0} إلى {1}..." -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 #, java-format @@ -9575,5 +10044,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9693,14 +10162,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 -#, java-format -msgid "" -"No primitive with id {0} in local dataset. Can't infer primitive type." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116 +#, java-format +msgid "No primitive with id {0} in local dataset. Can't infer primitive type." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 @@ -9728,24 +10196,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424 msgid "" "Server replied with response code 404, retrying with an individual request " "for each primitive." msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450 +#, fuzzy, java-format +msgid "Downloading {0} object from ''{1}''" +msgid_plural "Downloading {0} objects from ''{1}''" +msgstr[0] "جاري تحميل النقاط {0} إلى {1}..." +msgstr[1] "جاري تحميل النقاط {0} إلى {1}..." +msgstr[2] "جاري تحميل النقاط {0} إلى {1}..." +msgstr[3] "جاري تحميل النقاط {0} إلى {1}..." +msgstr[4] "جاري تحميل النقاط {0} إلى {1}..." +msgstr[5] "جاري تحميل النقاط {0} إلى {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9787,27 +10266,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 -#, java-format -msgid "" -"It supports protocol versions 0.5 and 0.6, while the server says it supports " -"{0} to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" @@ -9815,66 +10294,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "Preparing..." msgstr "اعداد..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "جاري الإرسال..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9909,5 +10388,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9934,5 +10413,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9940,5 +10419,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184 #, java-format msgid "Unsupported version: {0}" @@ -9951,5 +10430,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10007,7 +10486,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260 msgid "" -"WARNING: The password is stored in plain text in the preferences " -"file.
The password is transferred in plain text to the server, encoded in " -"the URL.
Do not use a valuable Password." +"WARNING: The password is stored in plain text in the preferences file." +"
The password is transferred in plain text to the server, encoded in the " +"URL.
Do not use a valuable Password." msgstr "" @@ -10035,6 +10514,6 @@ #, java-format msgid "" -"An error occurred while restoring backup file.
Error " -"is:
{0}" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "" @@ -10100,46 +10579,45 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 -#, java-format -msgid "" -"Missing manadatory attributes on element ''bounds''. Got " -"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 +#, java-format +msgid "" +"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 -#, java-format -msgid "" -"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270 +#, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 #, java-format msgid "" @@ -10147,19 +10625,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 msgid "Illegal object with ID=0." msgstr "غرض غير مسموح به معروف بــ id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354 #, java-format msgid "" @@ -10169,8 +10647,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378 #, java-format msgid "" @@ -10180,25 +10658,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 #, java-format msgid "" @@ -10206,5 +10684,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10213,5 +10691,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10219,5 +10697,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10226,13 +10704,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 msgid "Prepare OSM data..." msgstr "حضّر المعطيات أو.أس.أم ..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 msgid "Preparing data set..." msgstr "" @@ -10285,4 +10763,10 @@ msgid "Contacting Server..." msgstr "جاري الإتصال بلخادم" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10320,42 +10804,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:78 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:120 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 +msgid "Starting to upload in chunks..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 -msgid "" -"WARNING: no API version defined for data to upload. Falling back to version " -"0.6" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 -#, java-format -msgid "" -"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to " -"use diff uploads, but API is not able to handle them. Ignoring diff upload." msgstr "" @@ -10394,17 +10879,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:139 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 +#, fuzzy, java-format +msgid "Delete old plugin {0}" +msgstr "أمحي {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, java-format +msgid "Delete old plugin file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Skip Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:142 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:169 #, java-format msgid "JOSM version {0} required for plugin {1}." @@ -10416,19 +10911,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74 -#, java-format -msgid "" -"Loading of {0} plugin was requested. This plugin is no longer required." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75 +#, java-format +msgid "Plugin {0} is no longer necessary and has been deactivated." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84 #, java-format msgid "" "Loading of {0} plugin was requested.
This plugin is no longer " -"developed and very likely will produce errors.
It should be " -"disabled.
Delete from preferences?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +"developed and very likely will produce errors.
It should be disabled." +"
Delete from preferences?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 msgid "" "You updated your JOSM software.\n" @@ -10437,50 +10931,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:115 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Update plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Skip update" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182 #, java-format msgid "Plugin not found: {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:212 #, 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:222 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 msgid "Disable plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -10488,9 +10982,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:316 #, java-format msgid "" @@ -10498,19 +10992,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:319 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:324 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -10518,13 +11012,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342 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:386 msgid "Plugin information" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172 msgid "no description available" @@ -10633,6 +11127,6 @@ "

There the the error information provided below should already " "be
filled out for you. Please include information on how to " -"reproduce
the error and try to supply as much detail as " -"possible.

" +"reproduce
the error and try to supply as much detail as possible.

" msgstr "" @@ -10670,6 +11164,6 @@ msgid "" "Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message " -"is:
{0}" +"current
dataset violates a precondition.
The error message is:
{0}" msgstr "" @@ -10731,7 +11225,6 @@ #, java-format msgid "" -"The OSM server
''{0}''
reported an internal server " -"error.
This is most likely a temporary problem. Please try again " -"later." +"The OSM server
''{0}''
reported an internal server error." +"
This is most likely a temporary problem. Please try again later." msgstr "" @@ -10743,7 +11236,7 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" -"The area you tried to download is too big or your request was too " -"large.
Either request a smaller area or use an export file provided by " -"the OSM community." +"The area you tried to download is too big or your request was too large." +"
Either request a smaller area or use an export file provided by the OSM " +"community." msgstr "" @@ -10775,6 +11268,6 @@ "The server reports that an object is deleted.
Uploading " "failed if you tried to update or delete this object.
" -"Downloading failed if you tried to download this " -"object.

The error message is:
{0}" +"Downloading failed if you tried to download this object." +"

The error message is:
{0}" msgstr "" @@ -11029,5 +11522,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 #: build/trans_presets.java:2296 msgid "Address Interpolation" @@ -11042,12 +11535,10 @@ msgstr "" -#. NOTE: The following 2 arrays must match in number of elements and position -#. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -11055,440 +11546,143 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 +#, fuzzy +msgid "Numeric" +msgstr "الرقم" + +#. NOTE: The following 2 arrays must match in number of elements and position +#. Tag values for map +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Actual" +msgstr "طبيعي" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "صورة" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "إستئجار سيارة" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:202 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:213 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216 +#, fuzzy +msgid "Increment:" +msgstr "حرّر الفلق الخارجي" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:221 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226 +msgid "Accuracy:" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238 +msgid "Convert way to individual house numbers." +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:454 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:455 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:456 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:457 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:458 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:493 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:678 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:691 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1083 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 +msgid "Expected valid number for address increment" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311 msgid "Starting and ending numbers must be the same for alphabetic addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343 msgid "Starting address number must be less than ending address number" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "AgPifoJ - Geotagged pictures" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70 -#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 -msgid "Previous" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86 -#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 -msgid "Next" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126 -msgid "One of the selected files was null" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:132 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:135 -msgid "Read photos..." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48 -#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 -msgid "Load set of images as a new layer." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "خطء عند تحليل {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "لم أتمكن من قراءة \"{0}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 -msgid "" -"Take a photo of your GPS receiver while it displays the " -"time.
Display that photo here.
And then, simply capture the time you " -"read on the photo and select a timezone
" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 -msgid "No date" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 -msgid "" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 -msgid "GPX track: " -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 -msgid "" -"I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 -msgid "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:445 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:472 -#, java-format -msgid "Error on file {0}" msgstr "" @@ -11633,11 +11827,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 msgid "" -"A special handler of the French cadastre wms at " -"www.cadastre.gouv.fr

Please read the Terms and Conditions of Use here " -"(in French):
" -"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " -"
before any upload of data created by this plugin." +"A special handler of the French cadastre wms at www.cadastre.gouv." +"fr

Please read the Terms and Conditions of Use here (in French): " +"
http://www.cadastre.gouv.fr/scpc/html/" +"CU_01_ConditionsGenerales_fr.html
before any upload of data created " +"by this plugin." msgstr "" @@ -11944,12 +12137,4 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:63 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137 -#, java-format -msgid "Simplify Way (remove {0} node)" -msgid_plural "Simplify Way (remove {0} nodes)" -msgstr[0] "" -msgstr[1] "" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12061,14 +12246,14 @@ msgstr "" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +msgid "Split area" +msgstr "" + #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -msgid "Split area" -msgstr "" - -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." msgstr "" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78 msgid "" "The selected area cannot be splitted, because it is a member of some " @@ -12376,4 +12561,8 @@ msgstr "" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12417,18 +12606,18 @@ #. * #. * Run the nodelist through a vertex reduction algorithm -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:187 +#. +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188 msgid "Running vertex reduction..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:198 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:199 msgid "Running Douglas-Peucker approximation..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:209 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:285 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" @@ -12477,7 +12666,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12487,5 +12676,5 @@ #. 50000 #. -#. +#. #. #. @@ -12495,5 +12684,5 @@ #. 50000 #. -#. +#. #. #. @@ -12502,5 +12691,5 @@ #. 50000 #. -#. +#. #. #. @@ -12510,5 +12699,5 @@ #. 50000 #. -#. +#. #. #. @@ -12586,6 +12775,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "" -"Maximum number of segments allowed in each generated way. Default 250." +msgid "Maximum number of segments allowed in each generated way. Default 250." msgstr "" @@ -12604,7 +12792,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72 msgid "" -"Accuracy of Douglas-Peucker line simplification, measured in " -"degrees.
Lower values give more nodes, and more accurate lines. Default " -"0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." msgstr "" @@ -12666,20 +12853,19 @@ msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145 msgid "Connecting" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "" -#. not connected: -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193 -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251 msgid "Not connected" msgstr "" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "" @@ -12896,6 +13082,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169 -msgid "" -"Header contains several values and cannot be mapped to a single string" +msgid "Header contains several values and cannot be mapped to a single string" msgstr "" @@ -12976,9 +13161,10 @@ msgstr "إمتداد الملف غير معروف: {0}" -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:41 +#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45 +#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137 msgid "Osmarender" msgstr "" -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:95 +#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99 msgid "" "Firefox not found. Please set firefox executable in the Map Settings page of " @@ -12986,9 +13172,5 @@ msgstr "" -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "" - -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:127 +#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133 msgid "Firefox executable" msgstr "" @@ -13361,17 +13543,17 @@ msgstr "" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "" @@ -13416,160 +13598,4 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:149 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:65 -msgid "" -"The selected way(s) have nodes outside of the downloaded data region.\n" -"This can lead to nodes being deleted accidentally.\n" -"Are you really sure to continue?" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175 -msgid "No intersection found. Nothing was changed." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197 -msgid "Added node on all intersections" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236 -msgid "" -"Some of the ways were part of relations that have been modified. Please " -"verify no errors have been introduced." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "ادخل القيم لكل التناقضات." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "حلل التناقضات" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:88 -#, java-format -msgid "The selection contains {0} way. Are you sure you want to simplify it?" -msgid_plural "" -"The selection contains {0} ways. Are you sure you want to simplify them all?" -msgstr[0] "" -msgstr[1] "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "" - #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:93 @@ -13664,5 +13690,5 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:108 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100 #, java-format msgid "Running test {0}" @@ -13715,34 +13741,34 @@ msgstr "" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 +msgid "Whole group" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 +msgid "Single elements" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 +msgid "Nothing" +msgstr "" + #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 -msgid "Whole group" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 -msgid "Single elements" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 -msgid "Nothing" +msgid "Ignore whole group or individual elements?" msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 -msgid "Ignore whole group or individual elements?" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 msgid "Ignoring elements" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:459 msgid "Fixing errors ..." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:483 #, java-format msgid "Fixing ({0}/{1}): ''{2}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:500 msgid "Updating map ..." msgstr "" @@ -13791,18 +13817,18 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:73 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:44 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:68 msgid "Nodes at same position" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:130 msgid "Confirmation" msgstr "" @@ -14031,7 +14057,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "" -"The sources (URL or filename) of spell check (see " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking " -"data files." +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." msgstr "" @@ -14174,5 +14199,5 @@ #. 50000 #. -#. +#. #. #. @@ -14180,5 +14205,5 @@ #. #. -#. +#. #. #. @@ -14188,5 +14213,5 @@ #. 50000 #. -#. +#. #. #. @@ -14195,5 +14220,5 @@ #. 50000 #. -#. +#. #. #. @@ -14202,5 +14227,5 @@ #. 50000 #. -#. +#. #. #. @@ -14209,5 +14234,5 @@ #. 50000 #. -#. +#. #. #. @@ -14216,5 +14241,5 @@ #. 50000 #. -#. +#. #. #. @@ -14223,9 +14248,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14270,5 +14295,5 @@ #. 50000 #. -#. +#. #. #. @@ -14401,14 +14426,14 @@ msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:54 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 msgid "Way Download" msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:56 msgid "Download map data on the end of selected way" msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:98 msgid "" "Neither a node nor a way with an endpoint outside of the
current " @@ -14417,14 +14442,14 @@ msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:106 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:105 msgid "Could not find a unique node to start downloading from." msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:117 #, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:167 #, java-format msgid "" @@ -14433,5 +14458,5 @@ msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:182 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:181 #, java-format msgid "" @@ -14443,13 +14468,13 @@ msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:194 msgid "Merge duplicate node?" msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:211 msgid "No more connected ways to download." msgstr "" -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221 +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:220 #, java-format msgid "Node ''{0}'' is a junction with more than 2 connected ways." @@ -14603,50 +14628,50 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14722,5 +14747,5 @@ #. This file can be used to add some special messages to the translation, #. which are not part of the programm texts, but should be translated nevertheless. -#. +#. #: build/specialmessages.java:6 msgid "" @@ -14758,21 +14783,16 @@ #. Plugin AddrInterpolation #: build/trans_plugins.java:3 -msgid "Group common Address Interpolation inputs in a single dialog," -msgstr "" - -#. Plugin AgPifoJ +msgid "" +"Group common Address Interpolation inputs in a single dialog, as well as an " +"option to automatically generate individual house number nodes from a Way." +msgstr "" + +#. Plugin cadastre-fr #: build/trans_plugins.java:5 -msgid "" -"Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -"import EXIF geotagged pictures." -msgstr "" - -#. Plugin cadastre-fr +msgid "A special handler for the French land registry WMS server." +msgstr "" + +#. Plugin colorscheme #: build/trans_plugins.java:7 -msgid "A special handler for the French land registry WMS server." -msgstr "" - -#. Plugin colorscheme -#: build/trans_plugins.java:9 msgid "" "Allows the user to create different color schemes and to switch between " @@ -14784,21 +14804,21 @@ #. Plugin Create_grid_of_ways +#: build/trans_plugins.java:9 +msgid "Create a grid of ways." +msgstr "" + +#. Plugin czechaddress #: build/trans_plugins.java:11 -msgid "Create a grid of ways." -msgstr "" - -#. Plugin czechaddress +msgid "" +"Creating and handling address nodes and buildings within Czech Republic." +msgstr "" + +#. Plugin dataimport #: build/trans_plugins.java:13 -msgid "" -"Creating and handling address nodes and buildings within Czech Republic." -msgstr "" - -#. Plugin dataimport +msgid "Allows to import various file formats into JOSM directly." +msgstr "" + +#. Plugin DirectUpload #: build/trans_plugins.java:15 -msgid "Allows to import various file formats into JOSM directly." -msgstr "" - -#. Plugin DirectUpload -#: build/trans_plugins.java:17 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -14807,10 +14827,10 @@ #. Plugin Duplicate-Way +#: build/trans_plugins.java:17 +msgid "Duplicate Ways with an offset" +msgstr "" + +#. Plugin editgpx #: build/trans_plugins.java:19 -msgid "Duplicate Ways with an offset" -msgstr "" - -#. Plugin editgpx -#: build/trans_plugins.java:21 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -14819,21 +14839,20 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "" + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "" - -#. Plugin graphview +msgid "Visualizes routing information as a routing graph." +msgstr "" + +#. Plugin grid #: build/trans_plugins.java:25 -msgid "Visualizes routing information as a routing graph." -msgstr "" - -#. Plugin grid +msgid "Provide a background layer that displays a map grid" +msgstr "" + +#. Plugin ImageWayPoint #: build/trans_plugins.java:27 -msgid "Provide a background layer that displays a map grid" -msgstr "" - -#. Plugin ImageWayPoint -#: build/trans_plugins.java:29 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -14843,16 +14862,16 @@ #. Plugin lakewalker +#: build/trans_plugins.java:29 +msgid "Helps vectorizing WMS images." +msgstr "" + +#. Plugin livegps #: build/trans_plugins.java:31 -msgid "Helps vectorizing WMS images." -msgstr "" - -#. Plugin livegps +msgid "" +"Support live GPS input (moving dot) through a connection to gpsd server." +msgstr "" + +#. Plugin measurement #: build/trans_plugins.java:33 -msgid "" -"Support live GPS input (moving dot) through a connection to gpsd server." -msgstr "" - -#. Plugin measurement -#: build/trans_plugins.java:35 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -14862,10 +14881,10 @@ #. Plugin michigan_left +#: build/trans_plugins.java:35 +msgid "Adds no left turn for sets of 4 or 5 ways" +msgstr "" + +#. Plugin multipoly #: build/trans_plugins.java:37 -msgid "Adds no left turn for sets of 4 or 5 ways" -msgstr "" - -#. Plugin multipoly -#: build/trans_plugins.java:39 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -14874,5 +14893,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:39 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -14882,27 +14901,27 @@ #. Plugin openlayers +#: build/trans_plugins.java:41 +msgid "Displays an OpenLayers background image" +msgstr "" + +#. Plugin openstreetbugs #: build/trans_plugins.java:43 -msgid "Displays an OpenLayers background image" -msgstr "" - -#. Plugin openstreetbugs +msgid "Imports issues from OpenStreetBugs" +msgstr "" + +#. Plugin openvisible #: build/trans_plugins.java:45 -msgid "Imports issues from OpenStreetBugs" -msgstr "" - -#. Plugin openvisible +msgid "" +"Allows opening gpx/osm files that intersect the currently visible screen area" +msgstr "" + +#. Plugin osmarender #: build/trans_plugins.java:47 msgid "" -"Allows opening gpx/osm files that intersect the currently visible screen area" -msgstr "" - -#. Plugin osmarender +"Launches FireFox to display the current visible screen as a nice SVG image." +msgstr "" + +#. Plugin PicLayer #: build/trans_plugins.java:49 -msgid "" -"Launches FireFox to display the current visible screen as a nice SVG image." -msgstr "" - -#. Plugin PicLayer -#: build/trans_plugins.java:51 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -14911,15 +14930,15 @@ #. Plugin plastic_laf +#: build/trans_plugins.java:51 +msgid "The great JGoodies Plastic Look and Feel." +msgstr "" + +#. Plugin remotecontrol #: build/trans_plugins.java:53 -msgid "The great JGoodies Plastic Look and Feel." -msgstr "" - -#. Plugin remotecontrol -#: build/trans_plugins.java:55 msgid "Let other applications send commands to JOSM." msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -14928,10 +14947,10 @@ #. Plugin routing +#: build/trans_plugins.java:57 +msgid "Provides routing capabilities." +msgstr "" + +#. Plugin slippymap #: build/trans_plugins.java:59 -msgid "Provides routing capabilities." -msgstr "" - -#. Plugin slippymap -#: build/trans_plugins.java:61 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -14940,15 +14959,15 @@ #. Plugin surveyor +#: build/trans_plugins.java:61 +msgid "Allow adding markers/nodes on current gps positions." +msgstr "" + +#. Plugin tageditor #: build/trans_plugins.java:63 -msgid "Allow adding markers/nodes on current gps positions." -msgstr "" - -#. Plugin tageditor +msgid "Provides a dialog for editing tags in a tabular grid." +msgstr "" + +#. Plugin tagging-preset-tester #: build/trans_plugins.java:65 -msgid "Provides a dialog for editing tags in a tabular grid." -msgstr "" - -#. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -14958,17 +14977,10 @@ #. Plugin terracer +#: build/trans_plugins.java:67 +msgid "Make terraced houses out of single blocks." +msgstr "" + +#. Plugin validator #: build/trans_plugins.java:69 -msgid "Make terraced houses out of single blocks." -msgstr "" - -#. Plugin utilsplugin -#: build/trans_plugins.java:71 -msgid "" -"Several utilities that make your life easier: e.g. simplify way, join areas, " -"jump to position." -msgstr "" - -#. Plugin validator -#: build/trans_plugins.java:73 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -14977,5 +14989,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -14984,10 +14996,10 @@ #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -16040,8 +16052,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16238,5 +16250,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16246,5 +16258,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16263,5 +16275,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16271,5 +16283,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16288,5 +16300,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16296,5 +16308,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16313,5 +16325,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16321,5 +16333,5 @@ #. 300000 #. -#. +#. #. #. @@ -16334,5 +16346,5 @@ #. 300000 #. -#. +#. #. #. @@ -16350,5 +16362,5 @@ #. 50000 #. -#. +#. #. #. @@ -16366,5 +16378,5 @@ #. 40000 #. -#. +#. #. #. @@ -16373,5 +16385,5 @@ #. 40000 #. -#. +#. #. #. @@ -16381,5 +16393,5 @@ #. 50000 #. -#. +#. #. #. @@ -16399,5 +16411,5 @@ #. 50000 #. -#. +#. #. #. @@ -16406,5 +16418,5 @@ #. 50000 #. -#. +#. #. #. @@ -16414,5 +16426,5 @@ #. 50000 #. -#. +#. #. #. @@ -16462,7 +16474,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17161,5 +17173,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17198,5 +17210,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17292,5 +17304,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17447,5 +17459,5 @@ #. 50000 #. -#. +#. #. #. @@ -18832,5 +18844,5 @@ #. 30000 #. -#. +#. #. #. @@ -18840,5 +18852,5 @@ #. 40000 #. -#. +#. #. #. @@ -18848,5 +18860,5 @@ #. 20000 #. -#. +#. #. #. @@ -18856,5 +18868,5 @@ #. 40000 #. -#. +#. #. #. @@ -19212,7 +19224,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19222,5 +19234,5 @@ #. 50000 #. -#. +#. #. #. @@ -19230,5 +19242,5 @@ #. 50000 #. -#. +#. #. #. @@ -19238,5 +19250,5 @@ #. 50000 #. -#. +#. #. #. @@ -19246,5 +19258,5 @@ #. 50000 #. -#. +#. #. #. @@ -19254,5 +19266,5 @@ #. 50000 #. -#. +#. #. #. @@ -19262,5 +19274,5 @@ #. 50000 #. -#. +#. #. #. @@ -19270,5 +19282,5 @@ #. 50000 #. -#. +#. #. #. @@ -19278,5 +19290,5 @@ #. 50000 #. -#. +#. #. #. @@ -19286,5 +19298,5 @@ #. 50000 #. -#. +#. #. #. @@ -19294,5 +19306,5 @@ #. 50000 #. -#. +#. #. #. @@ -19302,5 +19314,5 @@ #. 50000 #. -#. +#. #. #. @@ -19310,5 +19322,5 @@ #. 50000 #. -#. +#. #. #. @@ -19318,5 +19330,5 @@ #. 50000 #. -#. +#. #. #. @@ -19326,5 +19338,5 @@ #. 50000 #. -#. +#. #. #. @@ -19334,5 +19346,5 @@ #. 50000 #. -#. +#. #. #. @@ -19342,5 +19354,5 @@ #. 50000 #. -#. +#. #. #. @@ -19350,5 +19362,5 @@ #. 50000 #. -#. +#. #. #. @@ -19358,5 +19370,5 @@ #. 50000 #. -#. +#. #. #. @@ -19366,5 +19378,5 @@ #. 50000 #. -#. +#. #. #. @@ -19374,5 +19386,5 @@ #. 50000 #. -#. +#. #. #. @@ -19382,5 +19394,5 @@ #. 50000 #. -#. +#. #. #. @@ -19390,5 +19402,5 @@ #. 50000 #. -#. +#. #. #. @@ -19398,5 +19410,5 @@ #. 50000 #. -#. +#. #. #. @@ -19406,5 +19418,5 @@ #. 50000 #. -#. +#. #. #. @@ -19414,5 +19426,5 @@ #. 50000 #. -#. +#. #. #. @@ -19422,5 +19434,5 @@ #. 50000 #. -#. +#. #. #. @@ -19430,5 +19442,5 @@ #. 50000 #. -#. +#. #. #. @@ -19438,5 +19450,5 @@ #. 50000 #. -#. +#. #. #. @@ -19446,5 +19458,5 @@ #. 50000 #. -#. +#. #. #. @@ -19454,5 +19466,5 @@ #. 50000 #. -#. +#. #. #. @@ -19462,5 +19474,5 @@ #. 50000 #. -#. +#. #. #. @@ -19470,5 +19482,5 @@ #. 50000 #. -#. +#. #. #. @@ -19478,5 +19490,5 @@ #. 50000 #. -#. +#. #. #. @@ -19486,5 +19498,5 @@ #. 50000 #. -#. +#. #. #. @@ -19494,5 +19506,5 @@ #. 50000 #. -#. +#. #. #. @@ -19502,5 +19514,5 @@ #. 50000 #. -#. +#. #. #. @@ -19510,5 +19522,5 @@ #. 50000 #. -#. +#. #. #. @@ -19518,5 +19530,5 @@ #. 50000 #. -#. +#. #. #. @@ -19526,5 +19538,5 @@ #. 50000 #. -#. +#. #. #. @@ -19534,5 +19546,5 @@ #. 50000 #. -#. +#. #. #. @@ -19542,5 +19554,5 @@ #. 50000 #. -#. +#. #. #. @@ -19550,5 +19562,5 @@ #. 50000 #. -#. +#. #. #. @@ -19558,5 +19570,5 @@ #. 50000 #. -#. +#. #. #. @@ -19566,5 +19578,5 @@ #. 50000 #. -#. +#. #. #. @@ -19574,5 +19586,5 @@ #. 50000 #. -#. +#. #. #. @@ -19582,5 +19594,5 @@ #. 50000 #. -#. +#. #. #. @@ -21274,7 +21286,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21284,5 +21296,5 @@ #. 50000 #. -#. +#. #. #. @@ -21292,5 +21304,5 @@ #. 50000 #. -#. +#. #. #. @@ -21300,5 +21312,5 @@ #. 50000 #. -#. +#. #. #. @@ -21308,5 +21320,5 @@ #. 50000 #. -#. +#. #. #. @@ -21316,5 +21328,5 @@ #. 50000 #. -#. +#. #. #. @@ -21324,5 +21336,5 @@ #. 50000 #. -#. +#. #. #. @@ -21332,5 +21344,5 @@ #. 50000 #. -#. +#. #. #. @@ -22661,5 +22673,5 @@ #. 40000 #. -#. +#. #. #. @@ -22675,5 +22687,5 @@ #. 30000 #. -#. +#. #. #. @@ -22684,7 +22696,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22694,5 +22706,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22702,13 +22722,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22718,5 +22730,5 @@ #. 50000 #. -#. +#. #. #. @@ -22749,5 +22761,5 @@ #. 50000 #. -#. +#. #. #. @@ -22763,5 +22775,5 @@ #. 50000 #. -#. +#. #. #. @@ -22771,5 +22783,5 @@ #. 10000 #. -#. +#. #. #. @@ -22779,5 +22791,5 @@ #. 10000 #. -#. +#. #. #. @@ -22788,5 +22800,5 @@ #. 10000 #. -#. +#. #. #. @@ -22815,5 +22827,5 @@ #. 50000 #. -#. +#. #. #. @@ -22928,9 +22940,9 @@ #. 7. scale_min / scale_max #. - zoom scale for display -#. +#. #. Using both area and line attributes for the same key/value pair does work. For areas #. first the rbest matching area rule is searched and the best matching line rule is #. connected with it. They need not have the same key/value pair. -#. +#. #. The colours can consist of the two components - name and hex code (e.g. water#0000ff). #. If both are given, the color name is introduced in preferences with that value. If only @@ -22938,5 +22950,5 @@ #. modified preferences or previous value is used. The 6 hex digit color code can also #. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6). -#. +#. #. Linemod's are drawn over or under the line they are associated with and modify the #. appearance. There can be multiple linemod's for one way (contrary to line styles, @@ -22946,8 +22958,8 @@ #. on the sides of the way or the waystyles itself must use alpha channel (which may #. look strange). -#. +#. #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted #. in case they have same priority! Using priority settings helps to solve conflicts. -#. +#. #. For external files the should have following elements: #. - author the author of the style @@ -22961,5 +22973,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -22967,5 +22979,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23014,6 +23026,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23093,5 +23105,5 @@ #. 40000 #. -#. +#. #. #. @@ -23101,5 +23113,5 @@ #. 10000 #. -#. +#. #. #. @@ -23108,5 +23120,5 @@ #. 50000 #. -#. +#. #. #. @@ -23116,5 +23128,5 @@ #. 50000 #. -#. +#. #. #. @@ -23123,5 +23135,5 @@ #. 50000 #. -#. +#. #. #. @@ -23130,5 +23142,5 @@ #. 50000 #. -#. +#. #. #. @@ -23137,5 +23149,5 @@ #. 50000 #. -#. +#. #. #. @@ -23144,5 +23156,5 @@ #. 50000 #. -#. +#. #. #. @@ -23151,5 +23163,5 @@ #. 40000 #. -#. +#. #. #. @@ -23158,5 +23170,5 @@ #. 50000 #. -#. +#. #. #. @@ -23165,5 +23177,5 @@ #. 50000 #. -#. +#. #. #. @@ -23172,5 +23184,5 @@ #. 50000 #. -#. +#. #. #. @@ -23179,5 +23191,5 @@ #. 50000 #. -#. +#. #. #. @@ -23186,5 +23198,5 @@ #. 50000 #. -#. +#. #. #. @@ -23193,5 +23205,5 @@ #. 50000 #. -#. +#. #. #. @@ -23201,5 +23213,5 @@ #. 50000 #. -#. +#. #. #. @@ -23208,5 +23220,5 @@ #. 50000 #. -#. +#. #. #. @@ -23217,5 +23229,5 @@ #. 50000 #. -#. +#. #. #. @@ -23227,11 +23239,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23240,7 +23252,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23251,5 +23263,5 @@ #. 50000 #. -#. +#. #. #. @@ -23260,5 +23272,5 @@ #. 50000 #. -#. +#. #. #. @@ -23269,5 +23281,5 @@ #. 50000 #. -#. +#. #. #. @@ -23278,5 +23290,5 @@ #. 50000 #. -#. +#. #. #. @@ -23287,5 +23299,5 @@ #. 50000 #. -#. +#. #. #. @@ -23296,5 +23308,5 @@ #. 40000 #. -#. +#. #. #. @@ -23306,5 +23318,5 @@ #. 50000 #. -#. +#. #. #. @@ -23315,5 +23327,5 @@ #. 50000 #. -#. +#. #. #. @@ -23338,5 +23350,5 @@ #. 10000 #. -#. +#. #. #. @@ -23345,5 +23357,5 @@ #. 50000 #. -#. +#. #. #. @@ -23352,5 +23364,5 @@ #. 50000 #. -#. +#. #. #. @@ -23366,5 +23378,5 @@ #. 20000 #. -#. +#. #. #. @@ -23378,5 +23390,5 @@ #. 30000 #. -#. +#. #. #. @@ -23385,5 +23397,5 @@ #. 50000 #. -#. +#. #. #. @@ -23392,5 +23404,5 @@ #. 50000 #. -#. +#. #. #. @@ -23399,5 +23411,5 @@ #. 50000 #. -#. +#. #. #. @@ -23406,5 +23418,5 @@ #. 50000 #. -#. +#. #. #. @@ -23413,5 +23425,5 @@ #. 50000 #. -#. +#. #. #. @@ -23420,5 +23432,5 @@ #. 50000 #. -#. +#. #. #. @@ -23427,5 +23439,5 @@ #. 50000 #. -#. +#. #. #. @@ -23434,5 +23446,5 @@ #. 50000 #. -#. +#. #. #. @@ -23441,5 +23453,5 @@ #. 50000 #. -#. +#. #. #. @@ -23448,5 +23460,5 @@ #. 50000 #. -#. +#. #. #. @@ -23455,5 +23467,5 @@ #. 50000 #. -#. +#. #. #. @@ -23462,5 +23474,5 @@ #. 50000 #. -#. +#. #. #. @@ -23469,5 +23481,5 @@ #. 50000 #. -#. +#. #. #. @@ -23476,5 +23488,5 @@ #. 50000 #. -#. +#. #. #. @@ -23645,7 +23657,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23659,5 +23671,5 @@ #. 40000 #. -#. +#. #. #. @@ -23667,7 +23679,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23677,5 +23689,5 @@ #. 50000 #. -#. +#. #. #. @@ -23685,5 +23697,5 @@ #. 50000 #. -#. +#. #. #. @@ -23693,5 +23705,5 @@ #. 50000 #. -#. +#. #. #. @@ -23701,5 +23713,5 @@ #. 50000 #. -#. +#. #. #. @@ -23715,5 +23727,5 @@ #. 10000 #. -#. +#. #. #. @@ -23723,5 +23735,5 @@ #. 50000 #. -#. +#. #. #. @@ -23731,5 +23743,5 @@ #. 50000 #. -#. +#. #. #. @@ -23739,5 +23751,5 @@ #. 50000 #. -#. +#. #. #. @@ -23747,5 +23759,5 @@ #. 50000 #. -#. +#. #. #. @@ -23755,5 +23767,5 @@ #. 50000 #. -#. +#. #. #. @@ -23763,5 +23775,5 @@ #. 50000 #. -#. +#. #. #. @@ -23780,5 +23792,5 @@ #. 50000 #. -#. +#. #. #. @@ -23787,5 +23799,5 @@ #. 50000 #. -#. +#. #. #. @@ -23799,5 +23811,5 @@ #. 50000 #. -#. +#. #. #. @@ -23811,5 +23823,5 @@ #. 50000 #. -#. +#. #. #. @@ -23818,5 +23830,5 @@ #. 50000 #. -#. +#. #. #. @@ -23830,5 +23842,5 @@ #. 50000 #. -#. +#. #. #. @@ -23843,5 +23855,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23856,5 +23868,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23868,5 +23880,5 @@ #. 50000 #. -#. +#. #. #. @@ -23880,5 +23892,5 @@ #. 50000 #. -#. +#. #. #. @@ -23887,5 +23899,5 @@ #. 50000 #. -#. +#. #. #. @@ -23894,5 +23906,5 @@ #. 50000 #. -#. +#. #. #. @@ -23906,5 +23918,5 @@ #. 50000 #. -#. +#. #. #. @@ -23914,5 +23926,5 @@ #. 50000 #. -#. +#. #. #. @@ -23921,5 +23933,5 @@ #. 50000 #. -#. +#. #. #. @@ -23928,5 +23940,5 @@ #. 50000 #. -#. +#. #. #. @@ -23935,5 +23947,5 @@ #. 50000 #. -#. +#. #. #. @@ -23943,5 +23955,5 @@ #. 50000 #. -#. +#. #. #. @@ -23952,5 +23964,5 @@ #. 50000 #. -#. +#. #. #. @@ -23960,7 +23972,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23970,5 +23982,5 @@ #. 50000 #. -#. +#. #. #. @@ -23978,5 +23990,5 @@ #. 50000 #. -#. +#. #. #. @@ -23986,5 +23998,5 @@ #. 50000 #. -#. +#. #. #. @@ -23995,5 +24007,5 @@ #. 50000 #. -#. +#. #. #. @@ -24003,5 +24015,5 @@ #. 50000 #. -#. +#. #. #. @@ -24011,5 +24023,5 @@ #. 50000 #. -#. +#. #. #. @@ -24019,5 +24031,5 @@ #. 50000 #. -#. +#. #. #. @@ -24027,5 +24039,5 @@ #. 50000 #. -#. +#. #. #. @@ -24035,5 +24047,5 @@ #. 50000 #. -#. +#. #. #. @@ -24043,5 +24055,5 @@ #. 50000 #. -#. +#. #. #. @@ -24051,5 +24063,5 @@ #. 50000 #. -#. +#. #. #. @@ -24059,5 +24071,5 @@ #. 50000 #. -#. +#. #. #. @@ -24080,7 +24092,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24090,5 +24102,5 @@ #. 50000 #. -#. +#. #. #. @@ -24097,5 +24109,5 @@ #. 50000 #. -#. +#. #. #. @@ -24105,5 +24117,5 @@ #. 50000 #. -#. +#. #. #. @@ -24112,5 +24124,5 @@ #. 50000 #. -#. +#. #. #. @@ -24120,5 +24132,5 @@ #. 50000 #. -#. +#. #. #. @@ -24128,5 +24140,5 @@ #. 50000 #. -#. +#. #. #. @@ -24142,5 +24154,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24151,5 +24163,5 @@ #. 50000 #. -#. +#. #. #. @@ -24168,5 +24180,5 @@ #. 50000 #. -#. +#. #. #. @@ -24176,5 +24188,5 @@ #. 50000 #. -#. +#. #. #. @@ -24187,5 +24199,5 @@ #. 50000 #. -#. +#. #. #. @@ -24203,5 +24215,5 @@ #. 50000 #. -#. +#. #. #. @@ -24210,5 +24222,5 @@ #. 50000 #. -#. +#. #. #. @@ -24217,5 +24229,5 @@ #. 50000 #. -#. +#. #. #. @@ -24224,7 +24236,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24235,5 +24247,5 @@ #. 50000 #. -#. +#. #. #. @@ -24248,5 +24260,5 @@ #. 50000 #. -#. +#. #. #. @@ -24260,5 +24272,5 @@ #. 50000 #. -#. +#. #. #. @@ -24268,5 +24280,5 @@ #. 50000 #. -#. +#. #. #. @@ -24280,5 +24292,5 @@ #. 50000 #. -#. +#. #. #. @@ -24292,5 +24304,5 @@ #. 50000 #. -#. +#. #. #. @@ -24299,7 +24311,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24309,5 +24321,5 @@ #. 50000 #. -#. +#. #. #. @@ -24317,5 +24329,5 @@ #. 50000 #. -#. +#. #. #. @@ -24325,5 +24337,5 @@ #. 50000 #. -#. +#. #. #. @@ -24333,5 +24345,5 @@ #. 50000 #. -#. +#. #. #. @@ -24347,7 +24359,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24362,5 +24374,5 @@ #. 30000 #. -#. +#. #. #. @@ -24375,5 +24387,5 @@ #. 30000 #. -#. +#. #. #. @@ -24388,5 +24400,5 @@ #. 30000 #. -#. +#. #. #. @@ -24401,5 +24413,5 @@ #. 30000 #. -#. +#. #. #. @@ -24414,5 +24426,5 @@ #. 30000 #. -#. +#. #. #. @@ -24427,7 +24439,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24437,5 +24449,5 @@ #. 50000 #. -#. +#. #. #. @@ -24444,5 +24456,5 @@ #. 50000 #. -#. +#. #. #. @@ -24452,5 +24464,5 @@ #. 50000 #. -#. +#. #. #. @@ -24460,5 +24472,5 @@ #. 50000 #. -#. +#. #. #. @@ -24468,5 +24480,5 @@ #. 50000 #. -#. +#. #. #. @@ -24476,5 +24488,5 @@ #. 50000 #. -#. +#. #. #. @@ -24484,5 +24496,5 @@ #. 50000 #. -#. +#. #. #. @@ -24492,5 +24504,5 @@ #. 50000 #. -#. +#. #. #. @@ -24500,5 +24512,5 @@ #. 50000 #. -#. +#. #. #. @@ -24508,5 +24520,5 @@ #. 50000 #. -#. +#. #. #. @@ -24516,5 +24528,5 @@ #. 50000 #. -#. +#. #. #. @@ -24524,5 +24536,5 @@ #. 50000 #. -#. +#. #. #. @@ -24532,5 +24544,5 @@ #. 50000 #. -#. +#. #. #. @@ -24550,5 +24562,5 @@ #. 50000 #. -#. +#. #. #. @@ -24563,5 +24575,5 @@ #. 50000 #. -#. +#. #. #. @@ -24574,7 +24586,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24584,5 +24596,5 @@ #. 50000 #. -#. +#. #. #. @@ -24592,5 +24604,5 @@ #. 50000 #. -#. +#. #. #. @@ -24600,5 +24612,5 @@ #. 50000 #. -#. +#. #. #. @@ -24608,5 +24620,5 @@ #. 50000 #. -#. +#. #. #. @@ -24616,5 +24628,5 @@ #. 50000 #. -#. +#. #. #. @@ -24624,5 +24636,5 @@ #. 50000 #. -#. +#. #. #. @@ -24632,5 +24644,5 @@ #. 50000 #. -#. +#. #. #. @@ -24640,5 +24652,5 @@ #. 50000 #. -#. +#. #. #. @@ -24648,5 +24660,5 @@ #. 50000 #. -#. +#. #. #. @@ -24656,5 +24668,5 @@ #. 50000 #. -#. +#. #. #. @@ -24664,5 +24676,5 @@ #. 50000 #. -#. +#. #. #. @@ -24672,5 +24684,5 @@ #. 50000 #. -#. +#. #. #. @@ -24680,5 +24692,5 @@ #. 50000 #. -#. +#. #. #. @@ -24688,5 +24700,5 @@ #. 50000 #. -#. +#. #. #. @@ -24707,5 +24719,5 @@ #. 50000 #. -#. +#. #. #. @@ -24719,7 +24731,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24729,5 +24741,5 @@ #. 50000 #. -#. +#. #. #. @@ -24737,5 +24749,5 @@ #. 50000 #. -#. +#. #. #. @@ -24745,5 +24757,5 @@ #. 50000 #. -#. +#. #. #. @@ -24753,5 +24765,5 @@ #. 50000 #. -#. +#. #. #. @@ -24761,5 +24773,5 @@ #. 50000 #. -#. +#. #. #. @@ -24769,5 +24781,5 @@ #. 50000 #. -#. +#. #. #. @@ -24777,5 +24789,5 @@ #. 50000 #. -#. +#. #. #. @@ -24792,5 +24804,5 @@ #. 50000 #. -#. +#. #. #. @@ -24800,5 +24812,5 @@ #. 50000 #. -#. +#. #. #. @@ -24808,5 +24820,5 @@ #. 50000 #. -#. +#. #. #. @@ -24816,5 +24828,5 @@ #. 50000 #. -#. +#. #. #. @@ -24824,5 +24836,5 @@ #. 50000 #. -#. +#. #. #. @@ -24832,5 +24844,5 @@ #. 50000 #. -#. +#. #. #. @@ -24840,5 +24852,5 @@ #. 50000 #. -#. +#. #. #. @@ -24848,5 +24860,5 @@ #. 50000 #. -#. +#. #. #. @@ -24856,5 +24868,5 @@ #. 50000 #. -#. +#. #. #. @@ -24864,5 +24876,5 @@ #. 50000 #. -#. +#. #. #. @@ -24872,5 +24884,5 @@ #. 50000 #. -#. +#. #. #. @@ -24880,5 +24892,5 @@ #. 50000 #. -#. +#. #. #. @@ -24897,5 +24909,5 @@ #. 50000 #. -#. +#. #. #. @@ -24905,5 +24917,5 @@ #. 50000 #. -#. +#. #. #. @@ -24912,5 +24924,5 @@ #. 50000 #. -#. +#. #. #. @@ -24920,5 +24932,5 @@ #. 50000 #. -#. +#. #. #. @@ -24928,5 +24940,5 @@ #. 50000 #. -#. +#. #. #. @@ -24936,5 +24948,5 @@ #. 50000 #. -#. +#. #. #. @@ -24943,5 +24955,5 @@ #. 50000 #. -#. +#. #. #. @@ -24951,5 +24963,5 @@ #. 50000 #. -#. +#. #. #. @@ -24959,5 +24971,5 @@ #. 50000 #. -#. +#. #. #. @@ -24967,5 +24979,5 @@ #. 50000 #. -#. +#. #. #. @@ -24975,5 +24987,5 @@ #. 50000 #. -#. +#. #. #. @@ -24982,5 +24994,5 @@ #. 50000 #. -#. +#. #. #. @@ -24989,5 +25001,5 @@ #. 50000 #. -#. +#. #. #. @@ -24996,5 +25008,5 @@ #. 50000 #. -#. +#. #. #. @@ -25003,5 +25015,5 @@ #. 50000 #. -#. +#. #. #. @@ -25010,5 +25022,5 @@ #. 50000 #. -#. +#. #. #. @@ -25017,5 +25029,5 @@ #. 50000 #. -#. +#. #. #. @@ -25024,5 +25036,5 @@ #. 50000 #. -#. +#. #. #. @@ -25031,5 +25043,5 @@ #. 50000 #. -#. +#. #. #. @@ -25038,5 +25050,5 @@ #. 50000 #. -#. +#. #. #. @@ -25045,5 +25057,5 @@ #. 50000 #. -#. +#. #. #. @@ -25052,5 +25064,5 @@ #. 50000 #. -#. +#. #. #. @@ -25059,5 +25071,5 @@ #. 50000 #. -#. +#. #. #. @@ -25066,5 +25078,5 @@ #. 50000 #. -#. +#. #. #. @@ -25074,5 +25086,5 @@ #. 50000 #. -#. +#. #. #. @@ -25082,5 +25094,5 @@ #. 50000 #. -#. +#. #. #. @@ -25090,5 +25102,5 @@ #. 50000 #. -#. +#. #. #. @@ -25098,5 +25110,5 @@ #. 50000 #. -#. +#. #. #. @@ -25106,5 +25118,5 @@ #. 50000 #. -#. +#. #. #. @@ -25114,5 +25126,5 @@ #. 50000 #. -#. +#. #. #. @@ -25122,5 +25134,5 @@ #. 50000 #. -#. +#. #. #. @@ -25130,5 +25142,5 @@ #. 50000 #. -#. +#. #. #. @@ -25138,5 +25150,5 @@ #. 50000 #. -#. +#. #. #. @@ -25147,5 +25159,5 @@ #. 50000 #. -#. +#. #. #. @@ -25155,5 +25167,5 @@ #. 50000 #. -#. +#. #. #. @@ -25163,5 +25175,5 @@ #. 50000 #. -#. +#. #. #. @@ -25171,5 +25183,5 @@ #. 50000 #. -#. +#. #. #. @@ -25179,5 +25191,5 @@ #. 50000 #. -#. +#. #. #. @@ -25187,5 +25199,5 @@ #. 50000 #. -#. +#. #. #. @@ -25195,5 +25207,5 @@ #. 50000 #. -#. +#. #. #. @@ -25203,5 +25215,5 @@ #. 50000 #. -#. +#. #. #. @@ -25211,5 +25223,5 @@ #. 50000 #. -#. +#. #. #. @@ -25219,5 +25231,5 @@ #. 50000 #. -#. +#. #. #. @@ -25227,5 +25239,5 @@ #. 50000 #. -#. +#. #. #. @@ -25235,5 +25247,5 @@ #. 50000 #. -#. +#. #. #. @@ -25243,5 +25255,5 @@ #. 50000 #. -#. +#. #. #. @@ -25251,5 +25263,5 @@ #. 50000 #. -#. +#. #. #. @@ -25259,5 +25271,5 @@ #. 50000 #. -#. +#. #. #. @@ -25267,5 +25279,5 @@ #. 50000 #. -#. +#. #. #. @@ -25275,5 +25287,5 @@ #. 50000 #. -#. +#. #. #. @@ -25283,5 +25295,5 @@ #. 50000 #. -#. +#. #. #. @@ -25291,5 +25303,5 @@ #. 50000 #. -#. +#. #. #. @@ -25298,5 +25310,5 @@ #. 50000 #. -#. +#. #. #. @@ -25328,5 +25340,5 @@ #. 50000 #. -#. +#. #. #. @@ -25336,5 +25348,5 @@ #. 50000 #. -#. +#. #. #. @@ -25344,7 +25356,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25359,5 +25371,5 @@ #. 50000 #. -#. +#. #. #. @@ -25367,5 +25379,5 @@ #. 50000 #. -#. +#. #. #. @@ -25375,5 +25387,5 @@ #. 50000 #. -#. +#. #. #. @@ -25383,5 +25395,5 @@ #. 50000 #. -#. +#. #. #. @@ -25391,5 +25403,5 @@ #. 50000 #. -#. +#. #. #. @@ -25399,5 +25411,5 @@ #. 50000 #. -#. +#. #. #. @@ -25407,5 +25419,5 @@ #. 50000 #. -#. +#. #. #. @@ -25421,7 +25433,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25431,5 +25443,5 @@ #. 50000 #. -#. +#. #. #. @@ -25439,5 +25451,5 @@ #. 50000 #. -#. +#. #. #. @@ -25447,5 +25459,5 @@ #. 50000 #. -#. +#. #. #. @@ -25455,5 +25467,5 @@ #. 50000 #. -#. +#. #. #. @@ -25463,5 +25475,5 @@ #. 50000 #. -#. +#. #. #. @@ -25471,5 +25483,5 @@ #. 50000 #. -#. +#. #. #. @@ -25479,5 +25491,5 @@ #. 50000 #. -#. +#. #. #. @@ -25487,5 +25499,5 @@ #. 50000 #. -#. +#. #. #. @@ -25495,5 +25507,5 @@ #. 50000 #. -#. +#. #. #. @@ -25503,5 +25515,5 @@ #. 50000 #. -#. +#. #. #. @@ -25511,5 +25523,5 @@ #. 50000 #. -#. +#. #. #. @@ -25519,5 +25531,5 @@ #. 50000 #. -#. +#. #. #. @@ -25527,5 +25539,5 @@ #. 50000 #. -#. +#. #. #. @@ -25535,5 +25547,5 @@ #. 50000 #. -#. +#. #. #. @@ -25543,5 +25555,5 @@ #. 50000 #. -#. +#. #. #. @@ -25551,5 +25563,5 @@ #. 50000 #. -#. +#. #. #. @@ -25559,5 +25571,5 @@ #. 50000 #. -#. +#. #. #. @@ -25567,5 +25579,5 @@ #. 50000 #. -#. +#. #. #. @@ -25575,5 +25587,5 @@ #. 50000 #. -#. +#. #. #. @@ -25583,5 +25595,5 @@ #. 50000 #. -#. +#. #. #. @@ -25591,5 +25603,5 @@ #. 50000 #. -#. +#. #. #. @@ -25599,5 +25611,5 @@ #. 50000 #. -#. +#. #. #. @@ -25607,5 +25619,5 @@ #. 50000 #. -#. +#. #. #. @@ -25615,5 +25627,5 @@ #. 50000 #. -#. +#. #. #. @@ -25623,5 +25635,5 @@ #. 50000 #. -#. +#. #. #. @@ -25631,5 +25643,5 @@ #. 50000 #. -#. +#. #. #. @@ -25639,5 +25651,5 @@ #. 50000 #. -#. +#. #. #. @@ -25647,5 +25659,5 @@ #. 50000 #. -#. +#. #. #. @@ -25655,5 +25667,5 @@ #. 50000 #. -#. +#. #. #. @@ -25663,5 +25675,5 @@ #. 50000 #. -#. +#. #. #. @@ -25671,5 +25683,5 @@ #. 50000 #. -#. +#. #. #. @@ -25679,5 +25691,5 @@ #. 50000 #. -#. +#. #. #. @@ -25687,5 +25699,5 @@ #. 50000 #. -#. +#. #. #. @@ -25695,5 +25707,5 @@ #. 50000 #. -#. +#. #. #. @@ -25703,5 +25715,5 @@ #. 50000 #. -#. +#. #. #. @@ -25711,5 +25723,5 @@ #. 50000 #. -#. +#. #. #. @@ -25719,5 +25731,5 @@ #. 50000 #. -#. +#. #. #. @@ -25727,5 +25739,5 @@ #. 50000 #. -#. +#. #. #. @@ -25735,5 +25747,5 @@ #. 50000 #. -#. +#. #. #. @@ -25743,5 +25755,5 @@ #. 50000 #. -#. +#. #. #. @@ -25751,5 +25763,5 @@ #. 50000 #. -#. +#. #. #. @@ -25759,5 +25771,5 @@ #. 50000 #. -#. +#. #. #. @@ -25793,7 +25805,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25803,5 +25815,5 @@ #. 50000 #. -#. +#. #. #. @@ -25811,5 +25823,5 @@ #. 50000 #. -#. +#. #. #. @@ -25819,5 +25831,5 @@ #. 50000 #. -#. +#. #. #. @@ -25827,5 +25839,5 @@ #. 50000 #. -#. +#. #. #. @@ -25835,5 +25847,5 @@ #. 50000 #. -#. +#. #. #. @@ -25843,5 +25855,5 @@ #. 50000 #. -#. +#. #. #. @@ -25851,5 +25863,5 @@ #. 50000 #. -#. +#. #. #. @@ -25866,5 +25878,5 @@ #. 50000 #. -#. +#. #. #. @@ -25874,5 +25886,5 @@ #. 50000 #. -#. +#. #. #. @@ -25882,5 +25894,5 @@ #. 50000 #. -#. +#. #. #. @@ -25890,5 +25902,5 @@ #. 50000 #. -#. +#. #. #. @@ -25898,5 +25910,5 @@ #. 50000 #. -#. +#. #. #. @@ -25906,5 +25918,5 @@ #. 50000 #. -#. +#. #. #. @@ -25915,5 +25927,5 @@ #. 50000 #. -#. +#. #. #. @@ -25923,5 +25935,5 @@ #. 50000 #. -#. +#. #. #. @@ -25931,5 +25943,5 @@ #. 40000 #. -#. +#. #. #. @@ -25939,5 +25951,5 @@ #. 50000 #. -#. +#. #. #. @@ -25946,5 +25958,5 @@ #. 40000 #. -#. +#. #. #. @@ -25953,5 +25965,5 @@ #. 40000 #. -#. +#. #. #. @@ -25969,7 +25981,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25979,5 +25991,5 @@ #. 50000 #. -#. +#. #. #. @@ -25987,5 +25999,5 @@ #. 50000 #. -#. +#. #. #. @@ -25995,5 +26007,5 @@ #. 50000 #. -#. +#. #. #. @@ -26003,5 +26015,5 @@ #. 50000 #. -#. +#. #. #. @@ -26011,5 +26023,5 @@ #. 50000 #. -#. +#. #. #. @@ -26019,5 +26031,5 @@ #. 50000 #. -#. +#. #. #. @@ -26027,5 +26039,5 @@ #. 50000 #. -#. +#. #. #. @@ -26035,5 +26047,5 @@ #. 50000 #. -#. +#. #. #. @@ -26043,5 +26055,5 @@ #. 50000 #. -#. +#. #. #. @@ -26060,5 +26072,5 @@ #. 50000 #. -#. +#. #. #. @@ -26072,5 +26084,5 @@ #. 50000 #. -#. +#. #. #. @@ -26084,5 +26096,5 @@ #. 50000 #. -#. +#. #. #. @@ -26092,5 +26104,5 @@ #. 50000 #. -#. +#. #. #. @@ -26104,5 +26116,5 @@ #. 50000 #. -#. +#. #. #. @@ -26116,5 +26128,5 @@ #. 50000 #. -#. +#. #. #. @@ -26128,6 +26140,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26137,5 +26149,5 @@ #. 50000 #. -#. +#. #. #. @@ -26149,5 +26161,5 @@ #. 50000 #. -#. +#. #. #. @@ -26161,5 +26173,5 @@ #. 50000 #. -#. +#. #. #. @@ -26173,5 +26185,5 @@ #. 50000 #. -#. +#. #. #. @@ -26185,5 +26197,5 @@ #. 50000 #. -#. +#. #. #. @@ -26197,5 +26209,5 @@ #. 50000 #. -#. +#. #. #. @@ -26205,7 +26217,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26215,5 +26227,5 @@ #. 50000 #. -#. +#. #. #. @@ -26223,5 +26235,5 @@ #. 50000 #. -#. +#. #. #. @@ -26231,5 +26243,5 @@ #. 50000 #. -#. +#. #. #. @@ -26239,5 +26251,5 @@ #. 50000 #. -#. +#. #. #. @@ -26254,5 +26266,5 @@ #. 50000 #. -#. +#. #. #. @@ -26265,5 +26277,5 @@ #. 50000 #. -#. +#. #. #. @@ -26277,5 +26289,5 @@ #. 50000 #. -#. +#. #. #. @@ -26289,5 +26301,5 @@ #. 50000 #. -#. +#. #. #. @@ -26301,5 +26313,5 @@ #. 50000 #. -#. +#. #. #. @@ -26310,5 +26322,5 @@ #. 50000 #. -#. +#. #. #. @@ -26318,5 +26330,5 @@ #. 50000 #. -#. +#. #. #. @@ -26326,5 +26338,5 @@ #. 50000 #. -#. +#. #. #. @@ -26334,5 +26346,5 @@ #. 50000 #. -#. +#. #. #. @@ -26342,5 +26354,5 @@ #. 50000 #. -#. +#. #. #. @@ -26357,5 +26369,5 @@ #. 50000 #. -#. +#. #. #. @@ -26369,5 +26381,5 @@ #. 50000 #. -#. +#. #. #. @@ -26381,5 +26393,5 @@ #. 50000 #. -#. +#. #. #. @@ -26393,5 +26405,5 @@ #. 50000 #. -#. +#. #. #. @@ -26405,5 +26417,5 @@ #. 50000 #. -#. +#. #. #. @@ -26417,5 +26429,5 @@ #. 50000 #. -#. +#. #. #. @@ -26424,7 +26436,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26434,5 +26446,5 @@ #. 50000 #. -#. +#. #. #. @@ -26442,5 +26454,5 @@ #. 50000 #. -#. +#. #. #. @@ -26450,5 +26462,5 @@ #. 50000 #. -#. +#. #. #. @@ -26458,5 +26470,5 @@ #. 50000 #. -#. +#. #. #. @@ -26466,5 +26478,5 @@ #. 50000 #. -#. +#. #. #. @@ -26474,5 +26486,5 @@ #. 50000 #. -#. +#. #. #. @@ -26482,5 +26494,5 @@ #. 50000 #. -#. +#. #. #. @@ -26497,7 +26509,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26507,5 +26519,5 @@ #. 50000 #. -#. +#. #. #. @@ -26515,5 +26527,5 @@ #. 50000 #. -#. +#. #. #. @@ -26523,5 +26535,5 @@ #. 50000 #. -#. +#. #. #. @@ -26531,5 +26543,5 @@ #. 50000 #. -#. +#. #. #. @@ -26545,5 +26557,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26592,5 +26604,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26600,5 +26612,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26608,5 +26620,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26616,5 +26628,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26624,5 +26636,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26632,5 +26644,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26640,5 +26652,5 @@ #. 50000 #. -#. +#. #. #. @@ -26648,5 +26660,5 @@ #. 50000 #. -#. +#. #. #. @@ -26656,5 +26668,5 @@ #. 50000 #. -#. +#. #. #. @@ -26664,5 +26676,5 @@ #. 50000 #. -#. +#. #. #. @@ -26672,5 +26684,5 @@ #. 50000 #. -#. +#. #. #. @@ -26680,5 +26692,5 @@ #. 50000 #. -#. +#. #. #. @@ -26698,5 +26710,5 @@ #. 50000 #. -#. +#. #. #. @@ -26705,5 +26717,5 @@ #. 50000 #. -#. +#. #. #. @@ -26712,5 +26724,5 @@ #. 50000 #. -#. +#. #. #. @@ -26719,5 +26731,5 @@ #. 40000 #. -#. +#. #. #. @@ -26726,5 +26738,5 @@ #. 40000 #. -#. +#. #. #. @@ -26733,5 +26745,5 @@ #. 40000 #. -#. +#. #. #. @@ -26826,5 +26838,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26832,28 +26844,28 @@ #. relation - a relation #. * - all data types -#. +#. #. Message type can be: #. E - an error #. W - a warning #. I - an low priority informational warning -#. +#. #. Key and value are expressions describing certain keys and values of these keys. #. Regulator expressions are supported. In this case the expressions starts and #. ends with // signs. If an 'i' is appended, the regular expression is #. case insensitive. -#. +#. #. The * sign indicates any string. #. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special #. handling for boolean values (yes, true, 0, false, no, ...). -#. +#. #. Expression can be: #. != - the key/value combination does not match #. == - the key/value combination does match -#. +#. #. To have more complicated expressions, multiple elements can be grouped together #. with an logical and (&&). -#. +#. #. The comment at the end of a rule is displayed in validator description -#. +#. #. Empty lines and space signs are ignored #: build/trans_validator.java:38 @@ -26968,5 +26980,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -26979,5 +26991,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27002,6 +27014,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27010,6 +27022,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27024,6 +27036,6 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& -#. -#. +#. +#. #. only for Czech Republic #: build/trans_wms.java:27 @@ -27037,6 +27049,6 @@ #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& -#. -#. +#. +#. #. only for GB #. fails with division by zero error @@ -27056,6 +27068,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27079,6 +27091,6 @@ #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF -#. -#. +#. +#. #. only for Italy #: build/trans_wms.java:46 @@ -27090,4 +27102,28 @@ msgid "Sicily - Italy" msgstr "" + +#~ msgid "Images for {0}" +#~ msgstr "الصول لِــ {0}" + +#~ msgid "Read GPX..." +#~ msgstr "إقرءGPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "لا توقيت للنقطة {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}" + +#~ msgid "current delta: {0}s" +#~ msgstr "الإنحراف الحالي: {0}ث" + +#~ msgid "timezone difference: " +#~ msgstr "إختلاف في التوقيت الجغرافي: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} من ضمن المسلك." + +#~ msgid "Image" +#~ msgstr "الصورة" #~ msgid "Unknown version" @@ -27163,11 +27199,7 @@ #~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت." -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً." - #~ msgid "Select a bookmark first." #~ msgstr "إختر أولاً إشارة مرجعية" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "الرجاء التبليغ بواسطة بطاقة عند {0}" @@ -27200,9 +27232,7 @@ #~ msgstr "غير قادر على الإتصال بلمخدم." -#, java-format #~ msgid "Authors: {0}" #~ msgstr "المؤلفون: {0}" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''" @@ -27229,12 +27259,7 @@ #~ msgstr "دمج التناقضات." -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "التناقضات: {0}" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "أمحي {1} {0}" - #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -27267,5 +27292,4 @@ #~ msgstr "حرّك إلى الأعلى" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "محرّر العلاقات: {0}" @@ -27274,5 +27298,4 @@ #~ msgstr "علاقة متناقضة" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "غير قادر على فتح دليل التفضيلات: {0}" @@ -27285,7 +27308,8 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" -#~ msgstr "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟" #~ msgid "All the ways were empty" @@ -27310,5 +27334,4 @@ #~ msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "خطء عند تحميل الصفحة {0}" @@ -27393,6 +27416,6 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" #~ "صفحة المساعدة مفقودة. إنشائها بِــ الإنكليزية أو